SONAR-4326 Move back tag management link outside of rule description, fix profile IT

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index fc2db3202751e048f92752ace65dd762cb101634..efbd745fca848a099abce487c9f93d3f48450cd7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -50,9 +50,19 @@
     <a name="rule<%= rule.id -%>"></a>
 
     <div id="rule_note_<%= rule.id -%>" class="marginbottom10">
-      <%= render :partial => 'rule_note', :locals => {:rule => rule,:profile_id => profile.id} %>
+      <%= render :partial => 'rule_note', :locals => {:rule => rule} %>
     </div>
 
+    <% if profiles_administrator? %>
+      <div class="marginbottom10">
+          <a class="link-action open-modal"
+            href="<%=ApplicationController.root_context-%>/rules_configuration/show_select_tags?rule_id=<%= u rule.id -%>&amp;profile_id=<%= u profile.id %>">
+           <%= message('rules_configuration.select_tags') -%></a>
+      </div>
+
+    <% end %>
+
+
     <%
        parent_active_rule = Internal.quality_profiles.parentProfileRule(rule) if (rule.inherited? || rule.overrides?)
        if parent_active_rule || !rule.params.empty?

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
index 913e5a6aac94b7de0f03be0d339e2c34785198a7..7b7c0aa7cdc827857df8fa135a14186598206fd3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
@@ -1,4 +1,4 @@
-<% #locals = rule, profile_id
+<% #locals = rule
   note = rule.ruleNote
   note_detail_div_id = "nd_" + rule.id.to_s
   note_extend_link_id = "nel_" + rule.id.to_s
@@ -26,13 +26,9 @@
     <div>
         <a href="#" id="<%= note_extend_link_id -%>" class="link-action spacer-right"
            onclick="$j('#<%= note_detail_div_id -%>').hide();$j('#<%= note_form_div_id -%>').show();$j('#<%= note_textarea_id -%>').focus();return false;"><%= message('rules_configuration.extend_description') %></a>
-        <a class="link-action open-modal"
-          href="<%=ApplicationController.root_context-%>/rules_configuration/show_select_tags?rule_id=<%= u rule.id -%>&amp;profile_id=<%= u profile_id %>">
-         <%= message('rules_configuration.select_tags') -%></a>
     </div>
-
   <% end %>
-  
+
 </div>
 
 <% if profiles_administrator? %>