SONAR-3755 Change order of button on issues pages

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index de233506fd463995965c737e9cc8d6da4ca77f30..a299a07569c4e4c06f39145f17d6e67fd2949ca6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -9,6 +9,12 @@
 
   <% if current_user %>
     <div class="marginbottom10" id="actionButtons">
+      <% unless issue.status == 'RESOLVED' %>
+        <%= button_to_remote message('issues.action.assign.button'),
+                             :url => {:controller => "issue", :action => "assign_form", :issue => @issue.key},
+                             :update => "actionForm",
+                             :complete => "$('actionButtons').remove();$('actionForm').show();" -%>
+      <% end %>
       <% @transitions.each do |transition| %>
         <%= button_to_remote message("issues.transition.#{transition.key}.button"),
                              :url => {:controller => "issue", :action => "transition_form", :issue => @issue.key, :transition => transition.key},
@@ -17,10 +23,6 @@
       <% end %>
 
       <% unless issue.status == 'RESOLVED' %>
-        <%= button_to_remote message('reviews.assign'),
-                             :url => {:controller => "issue", :action => "assign_form", :issue => @issue.key},
-                             :update => "actionForm",
-                             :complete => "$('actionButtons').remove();$('actionForm').show();" -%>
         <%= button_to_remote message('issues.action.change_severity.button'),
                              :url => {:controller => "issue", :action => "change_severity_form", :issue => @issue.key},
                              :update => "actionForm",

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
index 55839083c143c165df2c2d6a87299ada901492c4..7d1127502dd1d52bde0c912a6f53e8732a8130b0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
@@ -72,15 +72,16 @@
             <a href="#" onclick="$('issue-error-<%= issue.key -%>').hide(); return false;"><%= message('issues.hide_this_message') -%></a></div>
         <% end %>
 
+        <% unless issue.status == 'RESOLVED' %>
+          <%= link_to_function message('issues.action.assign.button'), "displayIssueAssignForm('#{issue.key}')",
+                               :name => message('issues.action.assign.button'), :class => 'link-action spacer-right' -%>
+        <% end %>
+
         <% Internal.issues.listTransitions(issue.key).each do |transition| %>
         <%= link_to_function message("issues.transition.#{transition.key}.button"), "displayIssueTransitionForm('#{issue.key}', '#{transition.key}')",
                              :name => message("issues.transition.#{transition.key}.button"), :class => 'link-action spacer-right' -%>
         <% end %>
 
-        <% unless issue.status == 'RESOLVED' %>
-        <%= link_to_function message('issues.action.assign.button'), "displayIssueAssignForm('#{issue.key}')",
-                             :name => message('issues.action.assign.button'), :class => 'link-action spacer-right' -%>
-        <% end %>
         <% unless issue.resolution == 'FALSE-POSITIVE' && issue.status == 'RESOLVED' %>
           <div class="dropdown">
             <a href="#" class="link-action link-more" onclick="showDropdownMenu('more<%= issue.key -%>');return false;"><%= message('more_actions') -%></a>