From 13ef8a8d4ebb984df8cc1f3507cc7335109c6580 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 26 Nov 2012 17:50:30 +0100
Subject: [PATCH] SONAR-3825 slight changes

---
 .../src/main/webapp/WEB-INF/app/models/measure_filter.rb  | 8 ++++++++
 .../app/views/system_measure_filters/index.html.erb       | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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 cc5e50dc5b2..055f437eeec 100644
--- 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 bb87a5bc4a4..611351adecd 100644
--- 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 %>
-- 
2.39.5