Mercurial > kallithea

changeset 7030:1d600909421e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequest: avoid empty lines in reviewer list after long lines Whitespace between the reviewer name and a hidden input element could cause line wrapping and leave an apparently empty line. Work around that by putting the empty element at the beginning of the line.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 12 Nov 2017 21:52:04 +0100
parents 6bef1d7bafa6
children dedfa09af3af
files kallithea/public/js/base.js kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/js/base.js	Mon Oct 30 01:20:34 2017 +0100
+++ b/kallithea/public/js/base.js	Sun Nov 12 21:52:04 2017 +0100
@@ -1274,6 +1274,7 @@
     var element = (
         '     <li id="reviewer_{2}">\n'+
         '       <span class="reviewers_member">\n'+
+        '         <input type="hidden" value="{2}" name="review_members" />\n'+
         '         <span class="reviewer_status" data-toggle="tooltip" title="not_reviewed">\n'+
         '             <i class="icon-circle changeset-status-not_reviewed"></i>\n'+
         '         </span>\n'+
@@ -1281,7 +1282,6 @@
         '         {0}\n' :
         '')+
         '         <span>{1}</span>\n'+
-        '         <input type="hidden" value="{2}" name="review_members" />\n'+
         '         <a href="#" class="reviewer_member_remove" onclick="removeReviewMember({2})">\n'+
         '             <i class="icon-minus-circled"></i>\n'+
         '         </a> (add not saved)\n'+
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Mon Oct 30 01:20:34 2017 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Sun Nov 12 21:52:04 2017 +0100
@@ -217,6 +217,7 @@
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <span class="reviewers_member">
+                  <input type="hidden" value="${member.user_id}" name="review_members" />
                   <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
                   </span>
@@ -227,7 +228,6 @@
                       (${_('Owner')})
                     %endif
                   </span>
-                  <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
                   <a href="#" class="reviewer_member_remove" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
                       <i class="icon-minus-circled"></i>