From: David Gageot <david@gageot.net>
Date: Mon, 28 May 2012 12:49:41 +0000 (+0200)
Subject: Remove hack that displays a link to edit filters
X-Git-Tag: 3.1~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0df594bd5e1752552c50be0901ec570bbcc80131;p=sonarqube.git

Remove hack that displays a link to edit filters
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
index 56aa47c93cc..7eaec5b2002 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
@@ -40,9 +40,12 @@ module WidgetPropertiesHelper
       user_filters = options_key(value, ::Filter.find(:all, :conditions => ['user_id=?', current_user.id]).sort_by(&:id))
       shared_filters = options_key(value, ::Filter.find(:all, :conditions => ['(user_id<>? or user_id is null) and shared=?', current_user.id, true]).sort_by(&:id))
 
-      select_tag definition.key(), option_group('My Filters', user_filters) + option_group('Shared Filters', shared_filters)
+      filters_combo = select_tag definition.key(), option_group('My Filters', user_filters) + option_group('Shared Filters', shared_filters)
+      filter_link = link_to message('widget.filter.edit'), {:controller => :filters, :action => :manage}, :class => 'link-action'
 
-    else
+      filters_combo + filter_link
+
+  else
       hidden_field_tag definition.key()
     end
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb
index fca835f2d4e..4dacfecb94d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb
@@ -18,9 +18,6 @@
         <td class="form-key-cell"><%= property_def.key() -%><%= "*" unless property_def.optional() -%></td>
         <td class="form-val-cell" id="row_<%= property_def.key() -%>">
           <%= property_value_field(property_def, widget.property_text_value(property_def.key())) -%>
-          <% if property_def.key() == 'filter' %>
-            <%= link_to message('widget.filter.edit'), {:controller => :filters, :action => :manage}, :class => 'link-action' %>
-          <% end %>
           <div class="form-val-note">
             <%= message("widget." + widget.key + ".param." + property_def.key(), :default => property_def.description()) -%>
           </div>