jro_apps/redmine Commit - r13470:b1e105abe2a2

Redirect to the current page when reordering roles (#18769)....

Jean-Philippe Lang -

r13470:b1e105abe2a2

parent child

Context file:

r13470:b1e105abe2a2

Collapse all files

app/controllers/roles_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RolesController < ApplicationController
               layout 'admin'
               before_filter :require_admin, :except => [:index, :show]
               before_filter :require_admin_or_api_request, :only => [:index, :show]
               before_filter :find_role, :only => [:show, :edit, :update, :destroy]
               accept_api_auth :index, :show
               def index
                 respond_to do |format|
                   format.html {
                     @role_pages, @roles = paginate Role.sorted, :per_page => 25
                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
                     @roles = Role.givable.to_a
                   }
                 end
               end
               def show
                 respond_to do |format|
                   format.api
                 end
               end
               def new
                 # Prefills the form with 'Non member' role permissions by default
                 @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
                 if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
                   @role.copy_from(@copy_from)
                 end
                 @roles = Role.sorted.to_a
               end
               def create
                 @role = Role.new(params[:role])
                 if request.post? && @role.save
                   # workflow copy
                   if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
                     @role.workflow_rules.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to roles_path
                 else
                   @roles = Role.sorted.to_a
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if @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
               end
               def destroy
                 @role.destroy
                 redirect_to roles_path
               rescue
                 flash[:error] =  l(:error_can_not_remove_role)
                 redirect_to roles_path
               end
               def permissions
                 @roles = Role.sorted.to_a
                 @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                 if request.post?
                   @roles.each do |role|
                     role.permissions = params[:permissions][role.id.to_s]
                     role.save
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to roles_path
                 end
               end
               private
               def find_role
                 @role = Role.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/roles/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_role_new), new_role_path, :class => 'icon icon-add' %>
             <%= link_to l(:label_permissions_report), permissions_roles_path, :class => 'icon icon-summary' %>
             </div>
             <h2><%=l(:label_role_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:label_role)%></th>
                 <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <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">
                 <%= link_to l(:button_copy), new_role_path(:copy => role), :class => 'icon icon-copy' %>
                 <%= delete_link role_path(role) unless role.builtin? %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @role_pages %></p>
             <% html_title(l(:label_role_plural)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages