diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-10 21:10:18 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-10 21:10:18 +0000 |
commit | f2ee9ccb1b45b84419a9757587298492ec4476a5 (patch) | |
tree | dc4dab286ec86114dcaddae09250c214d13a0367 /app | |
parent | b5731806fd561d7d47080bb3f4ba687fed1bfabc (diff) | |
download | redmine-f2ee9ccb1b45b84419a9757587298492ec4476a5.tar.gz redmine-f2ee9ccb1b45b84419a9757587298492ec4476a5.zip |
Merged r13852 and r13853 (#18769).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/issue_statuses_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/roles_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/trackers_controller.rb | 2 | ||||
-rw-r--r-- | app/views/issue_statuses/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/roles/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/trackers/index.html.erb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb index d305dedd7..375e7e13e 100644 --- a/app/controllers/issue_statuses_controller.rb +++ b/app/controllers/issue_statuses_controller.rb @@ -56,7 +56,7 @@ class IssueStatusesController < ApplicationController @issue_status = IssueStatus.find(params[:id]) if @issue_status.update_attributes(params[:issue_status]) flash[:notice] = l(:notice_successful_update) - redirect_to issue_statuses_path + redirect_to issue_statuses_path(:page => params[:page]) else render :action => 'edit' end diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index 8a976779e..61de2076d 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -71,7 +71,7 @@ class RolesController < ApplicationController def update if request.put? and @role.update_attributes(params[:role]) flash[:notice] = l(:notice_successful_update) - redirect_to roles_path + redirect_to roles_path(:page => params[:page]) else render :action => 'edit' end diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 02274d0d3..d5b5e71a9 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -64,7 +64,7 @@ class TrackersController < ApplicationController @tracker = Tracker.find(params[:id]) if @tracker.update_attributes(params[:tracker]) flash[:notice] = l(:notice_successful_update) - redirect_to trackers_path + redirect_to trackers_path(:page => params[:page]) return end edit diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index 659dd18fa..edec0bf75 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -25,7 +25,7 @@ <% end %> <td><%= checked_image status.is_default? %></td> <td><%= checked_image status.is_closed? %></td> - <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td> + <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status, :page => params[:page]}, :put) %></td> <td class="buttons"> <%= delete_link issue_status_path(status) %> </td> diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb index 9eaab23b6..19a6c42c4 100644 --- a/app/views/roles/index.html.erb +++ b/app/views/roles/index.html.erb @@ -17,7 +17,7 @@ <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td> <td class="reorder"> <% unless role.builtin? %> - <%= reorder_links('role', {:action => 'update', :id => role}, :put) %> + <%= reorder_links('role', {:action => 'update', :id => role, :page => params[:page]}, :put) %> <% end %> </td> <td class="buttons"> diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb index d1928e989..64f06fc5c 100644 --- a/app/views/trackers/index.html.erb +++ b/app/views/trackers/index.html.erb @@ -24,7 +24,7 @@ <% end %> </td> <td class="reorder"> - <%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %> + <%= reorder_links('tracker', {:action => 'update', :id => tracker, :page => params[:page]}, :put) %> </td> <td class="buttons"> <%= delete_link tracker_path(tracker) %> |