diff options
| author | David Gageot <david@gageot.net> | 2012-05-28 14:49:41 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-05-28 14:49:41 +0200 |
| commit | 0df594bd5e1752552c50be0901ec570bbcc80131 (patch) | |
| tree | 8090f18231686426e906b6b94e5b8dba95c4b788 /sonar-server | |
| parent | 278f7980fd80c7a2288840e1332ce30344fd74e8 (diff) | |
| download | sonarqube-0df594bd5e1752552c50be0901ec570bbcc80131.tar.gz sonarqube-0df594bd5e1752552c50be0901ec570bbcc80131.zip | |
Remove hack that displays a link to edit filters
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb | 7 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb | 3 |
2 files changed, 5 insertions, 5 deletions
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> |