SONAR-3825 slight changes

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
index cc5e50dc5b2c0165f10db8792bee5631bc631b3e..055f437eeec93d72d9c24ac94c1da3bbb5f84520 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
@@ -30,6 +30,10 @@ class MeasureFilter < ActiveRecord::Base
       @links = nil
     end
 
+    def resource
+      snapshot.resource
+    end
+
     def add_measure(measure)
       @measures_by_metric[measure.metric] = measure
     end
@@ -42,6 +46,10 @@ class MeasureFilter < ActiveRecord::Base
     def measure(metric)
       @measures_by_metric[metric]
     end
+
+    def measures
+      @measures_by_metric.values
+    end
   end
 
   # Column to be displayed

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system_measure_filters/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/system_measure_filters/index.html.erb
index bb87a5bc4a4052a8ab2899138da80eae9b0949a3..611351adecd2e80c437939c11e843661d60d2180 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/system_measure_filters/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/system_measure_filters/index.html.erb
@@ -16,7 +16,7 @@
     <% @system_filters.each do |filter| %>
       <tr id="system-<%= filter.name.parameterize -%>" class="<%= cycle('even', 'odd', :name => 'system-filters') -%>">
         <td>
-          <%= link_to h(filter.name), :action => 'filter', :id => filter.id -%>
+          <%= link_to h(filter.name), :controller => 'measures', :action => 'filter', :id => filter.id -%>
           <% if filter.description %>
             <div><%= h filter.description -%></div>
           <% end %>
@@ -53,7 +53,7 @@
     <% @shared_filters.each do |filter| %>
       <tr id="shared-<%= filter.name.parameterize -%>" class="<%= cycle('even', 'odd', :name => 'shared-filters') -%>">
         <td>
-          <%= link_to h(filter.name), :action => 'filter', :id => filter.id -%>
+          <%= link_to h(filter.name), :controller => 'measures', :action => 'filter', :id => filter.id -%>
           <% if filter.description %>
             <div><%= h filter.description -%></div>
           <% end %>