From d3c27297ab3f1e89df137d9fa1bae6c7a0f1c21e Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <bellingard@gmail.com>
Date: Tue, 24 Jan 2012 10:56:40 +0100
Subject: [PATCH] SONAR-1492 Allow notes per quality rule

Fix some issues
---
 .../resources/org/sonar/l10n/core.properties  |  4 +-
 .../app/controllers/rules_controller.rb       |  2 +-
 .../WEB-INF/app/views/rules/show.html.erb     | 46 ++++++++++---------
 .../_create_rule_note.html.erb                |  8 ++--
 .../views/rules_configuration/_rule.html.erb  | 18 +++-----
 .../views/rules_configuration/index.html.erb  |  6 +--
 .../src/main/webapp/stylesheets/style.css     |  1 +
 7 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 3dc7db53031..785960d3791 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -990,8 +990,8 @@ rules_configuration.rule_activation_note=Activation note
 rules_configuration.confirm_delete_note=Do you really want to delete this note?
 rules_configuration.add_note=Add note
 rules_configuration.add_activation_note=Add activation note
-rules_configuration.adding_note_description=This note will be linked to the current rule (whatever the profile) and will be visible to every user. It can be used to extend the predefined rule description.
-rules_configuration.adding_activation_note_decsription=This activation note will be linked to the active rule of the current profile and will be visible to every user. It can be used to explain why this rule was activated on this profile and/or why such parameter was specified.
+rules_configuration.adding_note_description=This note will be linked to the current rule (whatever the profile) and will be visible to every user. It can be used to extend the predefined rule description.<br/>HTML tags can be used in this field.
+rules_configuration.adding_activation_note_description=This activation note will be linked to the active rule of the current profile and will be visible to every user. It can be used to explain why this rule was activated on this profile and/or why such parameter was specified.<br/>HTML tags can be used in this field.
 rules_configuration.create_note=Create note
 rules_configuration.create_activation_note=Create activation note
 rules_configuration.rule_identification=Identification
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb
index 22a1fae82a9..c3fbea89bed 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb
@@ -33,7 +33,7 @@ class RulesController < ApplicationController
     
     if params[:resource_id]
       resource = Project.find(params[:resource_id])
-      @profile = resource.root_project.profile
+      @profile = resource.root_project.profile || Profile.default_profile
       @active_rule = @profile.active_by_rule_id(@rule.id)
     end
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
index 4f601111b85..1f9fb945606 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
@@ -18,29 +18,31 @@ Key: <%= @rule.plugin_rule_key %>
     <% if @active_rule %>
       <p><%= sanitize(@active_rule.note.text) if @active_rule.note %></p>
       
+      <% unless @rule.parameters.empty? %>
       <h3><%= message('rules.parameters') -%></h3>
-      <table>
-        <% @rule.parameters.each do |parameter|
-          active_parameter = @active_rule.active_param_by_param_id(parameter.id)
-        %>
-          <tbody>
-            <tr>
-              <td width="10%" nowrap class="left">
-                <%= parameter.name %>: &nbsp;
-              </td>
-              <td width="90%" nowrap class="left">
-                <%= active_parameter.value unless active_parameter.value.blank? -%>
-              </td>
-            </tr>
-            <tr>
-              <td></td>
-              <td style="padding-bottom:5px;">
-                <span class="note" style="white-space: normal"><%= h parameter.description -%></span>
-              </td>
-            </tr>
-          </tbody>
-        <% end %>
-      </table>
+        <table>
+          <% @rule.parameters.each do |parameter|
+            active_parameter = @active_rule.active_param_by_param_id(parameter.id)
+          %>
+            <tbody>
+              <tr>
+                <td width="10%" nowrap class="left">
+                  <%= parameter.name %>: &nbsp;
+                </td>
+                <td width="90%" nowrap class="left">
+                  <%= active_parameter.value unless active_parameter.value.blank? -%>
+                </td>
+              </tr>
+              <tr>
+                <td></td>
+                <td style="padding-bottom:5px;">
+                  <span class="note" style="white-space: normal"><%= h parameter.description -%></span>
+                </td>
+              </tr>
+            </tbody>
+          <% end %>
+        </table>
+      <% end %>
     <% end %>
   <% end %>
   
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_create_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_create_rule_note.html.erb
index ebc2ddaaa9a..fc089848ad9 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_create_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_create_rule_note.html.erb
@@ -18,7 +18,7 @@
            <%= 'style="display:none;"' if rule.note -%>>
     <input type="button" id="<%= create_active_rule_note_button_div_id -%>" value="<%= message('rules_configuration.add_activation_note') -%>"
            onclick="$('<%= create_buttons_div_id -%>').hide();$('<%= create_active_rule_note_form_div_id -%>').show();$('<%= active_rule_note_text_id -%>').focus();"
-           <%= 'style="display:none;"' if active_rule && active_rule.note -%>>
+           <%= 'style="display:none;"' unless active_rule && !active_rule.note -%>>
 </div>
 
 <div id="<%= create_rule_note_form_div_id -%>" style="display: none" class="admin">
@@ -26,19 +26,19 @@
                       :update => "rule_note_#{rule.id}",
                       :complete => "$('#{create_rule_note_form_div_id}').hide();$('#{create_buttons_div_id}').show();$('#{create_rule_note_button_div_id}').hide();" %>
     <textarea name="text" id="<%= rule_note_text_id -%>" cols="100" rows="10" onkeyup="if (this.value=='') $('<%= submit_rule_note_id -%>').disabled=true; else $('<%= submit_rule_note_id -%>').disabled=false;"></textarea>
-    <div class="note" style="padding: 5px 0px"><%= message('rules_configuration.adding_note_decsription') -%></div>
+    <div class="note" style="padding: 5px 0px"><%= message('rules_configuration.adding_note_description') -%></div>
     <input type="submit" value="<%= message('rules_configuration.create_note') -%>" name="commit" id="<%= submit_rule_note_id -%>" disabled/>
     <a href="#" onclick="$('<%= create_buttons_div_id -%>').show();$('<%= create_rule_note_form_div_id -%>').hide();return false;"><%= message('cancel') %></a>
   </form>
 </div>
 
-<% if active_rule%>
+<% if active_rule %>
 <div id="<%= create_active_rule_note_form_div_id -%>" style="display: none" class="admin">
   <%= form_remote_tag :url => {:action => 'update_note', :rule_id => active_rule.id, :is_active_rule => true},
                       :update => "active_rule_note_#{active_rule.id}",
                       :complete => "$('#{create_active_rule_note_form_div_id}').hide();$('#{create_buttons_div_id}').show();$('#{create_active_rule_note_button_div_id}').hide();"  %>
     <textarea name="text" id="<%= active_rule_note_text_id -%>" cols="100" rows="10" onkeyup="if (this.value=='') $('<%= submit_active_rule_note_id -%>').disabled=true; else $('<%= submit_active_rule_note_id -%>').disabled=false;"></textarea>
-    <div class="note" style="padding: 5px 0px"><%= message('rules_configuration.adding_activation_note_decsription')-%></div>
+    <div class="note" style="padding: 5px 0px"><%= message('rules_configuration.adding_activation_note_description')-%></div>
     <input type="submit" value="<%= message('rules_configuration.create_activation_note') -%>" name="commit" id="<%= submit_active_rule_note_id -%>" disabled/>
     <a href="#" onclick="$('<%= create_buttons_div_id -%>').show();$('<%= create_active_rule_note_form_div_id -%>').hide();return false;"><%= message('cancel') %></a>
   </form>
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 da6cad72dd4..8bbe7a19236 100644
--- 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
@@ -1,6 +1,4 @@
-<% color = cycle('even','odd') %>
 
-<tr id="rule_<%= rule.id -%>"  class="<%= color -%>">
   <td nowrap valign="top" class="left" x="<%= active_rule.failure_level if active_rule -%>" width="1%">
     <form id="levels_<%= rule.id -%>" action="">
       <% enable_modification = is_admin && !profile.provided?
@@ -30,19 +28,13 @@
       <% end %>
     </form>
   </td>
+  
   <td valign="top" class="left">
     <%= link_to_function("#{h rule.name}", nil, :class => "") do |page|
         page.toggle "desc_#{rule.id}"
       end
     %>
-  </td>
-  <script type="text/javascript">
-    Form.reset($('levels_<%= rule.id -%>'));
-  </script>
-</tr>
-
-<tr id="desc_<%= rule.id -%>" class="rule_detail <%= color -%>" style="display:none">
-  <td colspan="3">
+    <div id="desc_<%= rule.id -%>" class="rule_detail" style="display:none">
       <table width="100%">
         <tbody>
           <tr>
@@ -99,5 +91,9 @@
           </tr>
         </tbody>
       </table>
+    </div>    
   </td>
-</tr>
+
+  <script type="text/javascript">
+    Form.reset($('levels_<%= rule.id -%>'));
+  </script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
index be2e5c9b50c..cade9e03b02 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
@@ -118,9 +118,9 @@
   @rules.each do |rule|
     active_rule = @profile.active_by_rule_id(rule.id)
 %>
-  
-  <%= render :partial => 'rule', :object => rule, :locals => {:profile => @profile, :active_rule => active_rule, :is_admin => is_admin} %>
-  
+  <tr id="rule_<%= rule.id -%>" class="<%= cycle('even','odd') -%>">
+    <%= render :partial => 'rule', :object => rule, :locals => {:profile => @profile, :active_rule => active_rule, :is_admin => is_admin} %>
+  </tr>
 <% end %>
 </tbody>
 </table>
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 2ad72396f36..9d7aaa8e982 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2056,6 +2056,7 @@ ul.bullet li {
 
 .rule_detail {
   color: #444;
+  margin-top:10px;
 }
 
 .rule_detail > td > table {
-- 
2.39.5