diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-14 11:29:39 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-14 11:29:57 +0200 |
| commit | 43ea3ab1a76eea3187452d3d861c37222062d79c (patch) | |
| tree | d9206beaeacbfe67dc262e4dbe9674e30abc7939 /sonar-server | |
| parent | 4de8195b0c3aac67570370f22fd9918435fd9394 (diff) | |
| download | sonarqube-43ea3ab1a76eea3187452d3d861c37222062d79c.tar.gz sonarqube-43ea3ab1a76eea3187452d3d861c37222062d79c.zip | |
SONAR-4554 Do not display "Save" link after bulk change when a filter is selected
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb | 12 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb index 5015bd7503e..34b2fba5daf 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb @@ -33,8 +33,9 @@ class IssuesController < ApplicationController # GET /issues/search def search - @first_search = issues_query_params_sanitized.empty? @issues_query_params = criteria_params + @first_search = issues_query_params_sanitized.empty? + @unchanged = issues_query_params_sanitized.empty? if params[:id] @filter = find_filter(params[:id].to_i) @@ -191,10 +192,11 @@ class IssuesController < ApplicationController end def criteria_params - params['pageSize'] = PAGE_SIZE unless request.xhr? - params.delete('controller') - params.delete('action') - params + new_params = params.clone + new_params['pageSize'] = PAGE_SIZE unless request.xhr? + new_params.delete('controller') + new_params.delete('action') + new_params end def issues_query_params_sanitized diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb index b99e8a975e5..41d8cd697a2 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb @@ -4,7 +4,7 @@ <% if @filter && @filter.id %> <li><a id="copy" href="<%= url_for :action => 'copy_form', :id => @filter.id -%>" class="link-action open-modal"><%= message('copy') -%></a></li> <% end %> - <% if !defined?(@unchanged) && @filter && @filter.id && @filter.user == current_user.login %> + <% if !@unchanged && @filter && @filter.id && @filter.user == current_user.login %> <li> <%= link_to message('save'), params.merge({:action => 'save', :id => @filter.id}), :class => 'link-action', :id => 'save', :method => :post -%> </li> |