SONAR-2124 Fix some issues

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_active_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_active_rule_note.html.erb
index cc1280f30c4be050102099e8b706a10394381dec..abb7ffb37953c937082dff4db11e8cbc9cf04b62 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_active_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_active_rule_note.html.erb
@@ -29,7 +29,7 @@
         <% end %>
       </h4>
       <p><%= note.html_text -%></p>
-  <% elsif is_admin %>
+  <% elsif is_admin && !active_rule.rules_profile.provided? %>
     <input type="button" id="<%= add_active_note_button_id -%>" value="<%= message('rules_configuration.add_note') -%>" 
            onclick="$('<%= active_note_form_div_id -%>').show();$('<%= active_note_detail_div_id -%>').hide();$('<%= active_note_textarea_id -%>').focus();">
   <% end %>

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 a2e6f2b29f2c70425814e53cf365525b2e946028..faa8602dd0c2277d136eda1b9868fbfbed727190 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
@@ -74,7 +74,7 @@
                   %>
                     <tbody id="param_<%= parameter.id -%>">
                     <%= render :partial => 'rule_param', :object => nil,
-                      :locals => {:parameter => parameter, :active_parameter => active_parameter, :profile => profile, 
+                      :locals => {:parameter => parameter, :active_parameter => active_parameter, :profile => profile, :rule => rule,
                                   :active_rule => active_rule, :ancestor_active_rule => ancestor_active_rule, :is_admin => is_admin } %>
                     </tbody>
                   <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
index 49a625cd7126c3d715d816bd49884705d67a39e9..c47005939decc95993b41ae6a22375f1355191ef 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
@@ -14,9 +14,9 @@
     </td>
     <td width="90%" nowrap class="left">
         <%= form_remote_tag :url => {:action => 'update_param', :id => active_param_id, :profile_id => profile.id, :param_id => parameter.id, :active_rule_id => active_rule_id},
-            :update => "rule_#{active_rule.rule_id}",
+            :update => "rule_#{rule.id}",
             :loading => "$('param_loading_#{parameter.id}').show();",
-            :complete => "$('desc_#{active_rule.rule_id}').show();" %>
+            :complete => "$('desc_#{rule.id}').show();" %>
 
         <% span_id = "text_#{parameter.id}" %>
         <% read_only = !active_rule || !enable_modification %>
@@ -35,7 +35,7 @@
         <% end %>
         
         <% 
-           if active_rule.overrides? && ancestor_active_rule
+           if active_rule && active_rule.overrides? && ancestor_active_rule
              ancestor_param = ancestor_active_rule.active_param_by_param_id(parameter.id)
              ancestor_value = ancestor_param.value unless ancestor_param.value.blank?