Fix review form after Bugzilla 4.2.5 update

* code-review.js:
(fetchHistory):
- Trim author since new format adds a space before the name.
- Update comment_marker to match the text now used by Bugzilla.

* template/en/custom/attachment/reviewform.html.tmpl:
- Add global/header.html.tmpl to make sure we get the standard
  HTML for including CSS, JavaScript, etc.
  - Remove redundant <link> tags.
  - Add CSS in local <style> to hide the header.
  - Change local <script> to be passed as an argument into
    global/header.html.tmpl when it is processed.
  - NOTE: local <style> tag should be passed as an argument into
    global/header.html.tmpl, but that breaks page layout, so it
    was skipped for now.
- Fix fallout form moving flag_types into the attachment object
  when processing flag/list.html.tmpl.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 9045eb0..f10158c 100644 (file)
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -555,10 +555,10 @@ var CODE_REVIEW_UNITTEST;
       $.get('show_bug.cgi?id=' + bug_id, function(data) {
         var comments = [];
         $(data).find('.bz_comment').each(function() {
-          var author = $(this).find('.email').text();
+          var author = $(this).find('.email').text().trim();
           var text = $(this).find('.bz_comment_text').text();
 
-          var comment_marker = '(From update of attachment ' + attachment_id + ' .details.)';
+          var comment_marker = 'Comment on attachment ' + attachment_id + ' .details.';
           if (text.match(comment_marker))
             $.merge(comments, scanForComments(author, text));
 

diff --git a/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl b/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
index 7b210a6..2ba094e 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
@@ -19,23 +19,22 @@
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
+
 [% USE CGI %]
 [%  
     # We use a query string rietveldreview=true to indicate when in rietveld mode. 
     rietveldReview = CGI.param('rietveldreview')
 %]
 
-<link href="skins/standard/global.css" rel="stylesheet" type="text/css">
-<link href="skins/custom/global.css" rel="stylesheet" type="text/css">
 <style>
 * { font-size: small; }
 #comment { width: 100%; height: 100%; font-family: monospace; }
 #form-controls { height: 40px; }
 #form-controls td { width: 25%; text-align: center; }
+#header { display: none; }
 </style>
 
-<script type="text/javascript">
-  <!--
+[% javascript = BLOCK %]
   var viewing_formatted_diff = true;
   function viewPrettyPatch()
     {
@@ -73,8 +72,11 @@
          return true;
 [% END %]
     }
-  //-->
-</script>
+[% END %]
+
+[% PROCESS global/header.html.tmpl
+  javascript = javascript
+%]
 
 <form method="post" action="attachment.cgi" target="_top" onsubmit="return onSubmitComments();">
   <input type="hidden" name="id" value="[% attachment.id %]">
@@ -99,8 +101,10 @@
     <button id="submitBtn" type="submit">Submit</button>
 </td>
 <td>
-    [% IF flag_types.size > 0 %]
-      [% PROCESS "flag/list.html.tmpl" bug_id=attachment.bug_id attach_id=attachment.id %]<br>
+    [% IF attachment.flag_types.size > 0 %]
+      [% PROCESS "flag/list.html.tmpl" attach_id = attachment.id
+                                       bug_id = attachment.bug_id
+                                       flag_types = attachment.flag_types %]<br>
     [% END %]
 </td>
 <td>