SONAR-3792 When renaming a manual metric, the key of this manual metric must not...

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
index 688d266a3245d801b0e5b898b1a62a3201247e24..f1aa452e30400e16508b0fc256591a449c5e4bb7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
@@ -44,7 +44,7 @@ class MetricsController < ApplicationController
 
     metric.attributes=params[:metric]
     if metric.short_name(false)
-      metric.name = metric.short_name(false).downcase.gsub(/\s/, '_')[0..59]
+      metric.name = metric.short_name(false).downcase.gsub(/\s/, '_')[0..59] unless params[:id]
     end
     unless params[:newdomain].blank?
       metric.domain = params[:newdomain]

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index 411bd851ab6319990b47eca6b2e5a39554f96b5a..ef3a13ffb0a44ef04bc2da96dd8609d16310439f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -16,11 +16,11 @@
         <tbody>
       <% @metrics.each do |metric| %>
         <tr>
-          <td class="left" nowrap><span class="note"><%= metric.key -%></span></td>
-          <td class="left" nowrap><%= h metric.short_name -%></td>
-          <td class="left"><%= h metric.description -%></td>
-          <td class="left" ><%= metric.domain -%></td>
-          <td class="left" ><%= metric.value_type_name -%></td>
+          <td class="left" nowrap id="metric_key_<%= metric.key -%>"><span class="note"><%= metric.key -%></span></td>
+          <td class="left" nowrap id="metric_name_<%= metric.key -%>"><%= h metric.short_name -%></td>
+          <td class="left" id="metric_desc_<%= metric.key -%>"><%= h metric.description -%></td>
+          <td class="left" id="metric_domain_<%= metric.key -%>"><%= metric.domain -%></td>
+          <td class="left" id="metric_type_name<%= metric.key -%>"><%= metric.value_type_name -%></td>
           <td class="right thin nowrap">
             <% if is_admin? && metric.updatable_online? %>
               <%= link_to 'Edit', {:action => 'index', :id => metric.id}, {:class => 'link-action', :id => "edit_#{h(metric.short_name)}", :method => 'get'} %>