diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-06-20 17:44:01 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-06-20 17:44:11 +0200 |
| commit | 470429ce14c2ca8d136992ea7c34468632fd7d1d (patch) | |
| tree | 1c0daea0e14e9ba6345a5d6d4de87bc93073bb03 | |
| parent | 3207a389ee843d30591cc806ac2de9f24f7fd756 (diff) | |
| download | sonarqube-470429ce14c2ca8d136992ea7c34468632fd7d1d.tar.gz sonarqube-470429ce14c2ca8d136992ea7c34468632fd7d1d.zip | |
SONAR-4391 Do not save page index in issue filter
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb | 11 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb | 2 |
2 files changed, 11 insertions, 2 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 20612978038..5fb1f0499ac 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 @@ -67,7 +67,7 @@ class IssuesController < ApplicationController # GET /issues/save_as_form?[&criteria] def save_as_form - @filter_query_serialized = Internal.issues.serializeFilterQuery(criteria_params) + @filter_query_serialized = Internal.issues.serializeFilterQuery(criteria_params_to_save) render :partial => 'issues/save_as_form' end @@ -91,7 +91,7 @@ class IssuesController < ApplicationController verify_post_request require_parameters :id - filter_result = Internal.issues.updateIssueFilterQuery(params[:id].to_i, criteria_params) + filter_result = Internal.issues.updateIssueFilterQuery(params[:id].to_i, criteria_params_to_save) if filter_result.ok @filter = filter_result.get() redirect_to :action => 'filter', :id => @filter.id.to_s @@ -200,4 +200,11 @@ class IssuesController < ApplicationController criteria end + def criteria_params_to_save + criteria = criteria_params + criteria.delete('id') + criteria.delete('pageIndex') + criteria + end + end
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb index 766f78756b5..67f29e04c80 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb @@ -77,6 +77,8 @@ </tbody> </table> + <br/> + <h1><%= message 'issue_filter.manage.shared_filters' -%></h1> <table class="data" id="shared-filters"> <thead> |