diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2016-12-21 15:02:05 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2016-12-23 15:09:34 +0000 |
| commit | d7a2e92ca0ae7fba4898f2f8ab722033b0721ec9 (patch) | |
| tree | 9ae4cf37bbfaa01146136598996c5a6c340040eb /app/controllers | |
| parent | 805bbe889328bff55b49290294721405148cc980 (diff) | |
| download | gitlab-ce-d7a2e92ca0ae7fba4898f2f8ab722033b0721ec9.tar.gz | |
applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-empty
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard/todos_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index 40652129f4c..e3933e3d7b1 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -5,7 +5,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController @sort = params[:sort] @todos = @todos.page(params[:page]) if @todos.out_of_range? && @todos.total_pages != 0 - redirect_to dashboard_todos_path(page: @todos.total_pages) + redirect_to url_for(params.merge(page: @todos.total_pages)) end end diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 0efeec98570..2beb0df8a07 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -26,7 +26,7 @@ class Projects::IssuesController < Projects::ApplicationController @issues = issues_collection @issues = @issues.page(params[:page]) if @issues.out_of_range? && @issues.total_pages != 0 - return redirect_to namespace_project_issues_path(page: @issues.total_pages) + return redirect_to url_for(params.merge(page: @issues.total_pages)) end if params[:label_name].present? diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 050d0ca77ae..fc8a289d49d 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -39,7 +39,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_requests = merge_requests_collection @merge_requests = @merge_requests.page(params[:page]) if @merge_requests.out_of_range? && @merge_requests.total_pages != 0 - return redirect_to namespace_project_merge_requests_path(page: @merge_requests.total_pages) + return redirect_to url_for(params.merge(page: @merge_requests.total_pages)) end if params[:label_name].present? |