jro_apps/redmine Commit - r10102:ca7498c2d6cc

Create role by copy (#9258)....

Jean-Philippe Lang -

r10102:ca7498c2d6cc

parent child

Context file:

r10102:ca7498c2d6cc

Collapse all files

app/controllers/roles_controller.rb +4 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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
               before_filter :require_admin_or_api_request, :only => :index
               before_filter :find_role, :only => [:edit, :update, :destroy]
               accept_api_auth :index
               def index
                 respond_to do |format|
                   format.html {
                     @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
                     @roles = Role.givable.all
                   }
                 end
               end
               def new
-                # Prefills the form with 'Non member' role permissions
+                # 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.all
               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 :action => 'index'
                 else
                   @roles = Role.sorted.all
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if request.put? and @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index'
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 @role.destroy
                 redirect_to :action => 'index'
               rescue
                 flash[:error] =  l(:error_can_not_remove_role)
                 redirect_to :action => 'index'
               end
               def permissions
                 @roles = Role.sorted.all
                 @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 :action => 'index'
                 end
               end
               private
               def find_role
                 @role = Role.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/role.rb +9 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 Role < ActiveRecord::Base
               # Custom coder for the permissions attribute that should be an
               # array of symbols. Rails 3 uses Psych which can be *unbelievably*
               # slow on some platforms (eg. mingw32).
               class PermissionsAttributeCoder
                 def self.load(str)
                   str.to_s.scan(/:([a-z0-9_]+)/).flatten.map(&:to_sym)
                 end
                 def self.dump(value)
                   YAML.dump(value)
                 end
               end
               # Built-in roles
               BUILTIN_NON_MEMBER = 1
               BUILTIN_ANONYMOUS  = 2
               ISSUES_VISIBILITY_OPTIONS = [
                 ['all', :label_issues_visibility_all],
                 ['default', :label_issues_visibility_public],
                 ['own', :label_issues_visibility_own]
               ]
               scope :sorted, order("#{table_name}.builtin ASC, #{table_name}.position ASC")
               scope :givable, order("#{table_name}.position ASC").where(:builtin => 0)
               scope :builtin, lambda { |*args|
                 compare = (args.first == true ? 'not' : '')
                 where("#{compare} builtin = 0")
               }
               before_destroy :check_deletable
               has_many :workflow_rules, :dependent => :delete_all do
                 def copy(source_role)
                   WorkflowRule.copy(nil, source_role, nil, proxy_association.owner)
                 end
               end
               has_many :member_roles, :dependent => :destroy
               has_many :members, :through => :member_roles
               acts_as_list
               serialize :permissions, ::Role::PermissionsAttributeCoder
               attr_protected :builtin
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :issues_visibility,
                 :in => ISSUES_VISIBILITY_OPTIONS.collect(&:first),
                 :if => lambda {|role| role.respond_to?(:issues_visibility)}
+              # Copies attributes from another role, arg can be an id or a Role
+              def copy_from(arg, options={})
+                return unless arg.present?
+                role = arg.is_a?(Role) ? arg : Role.find_by_id(arg.to_s)
+                self.attributes = role.attributes.dup.except("id", "name", "position", "builtin", "permissions")
+                self.permissions = role.permissions.dup
+                self
+              end
               def permissions=(perms)
                 perms = perms.collect {|p| p.to_sym unless p.blank? }.compact.uniq if perms
                 write_attribute(:permissions, perms)
               end
               def add_permission!(*perms)
                 self.permissions = [] unless permissions.is_a?(Array)
                 permissions_will_change!
                 perms.each do |p|
                   p = p.to_sym
                   permissions << p unless permissions.include?(p)
                 end
                 save!
               end
               def remove_permission!(*perms)
                 return unless permissions.is_a?(Array)
                 permissions_will_change!
                 perms.each { |p| permissions.delete(p.to_sym) }
                 save!
               end
               # Returns true if the role has the given permission
               def has_permission?(perm)
                 !permissions.nil? && permissions.include?(perm.to_sym)
               end
               def <=>(role)
                 if role
                   if builtin == role.builtin
                     position <=> role.position
                   else
                     builtin <=> role.builtin
                   end
                 else
                   -1
                 end
               end
               def to_s
                 name
               end
               def name
                 case builtin
                 when 1; l(:label_role_non_member, :default => read_attribute(:name))
                 when 2; l(:label_role_anonymous,  :default => read_attribute(:name))
                 else; read_attribute(:name)
                 end
               end
               # Return true if the role is a builtin role
               def builtin?
                 self.builtin != 0
               end
               # Return true if the role is a project member role
               def member?
                 !self.builtin?
               end
               # Return true if role is allowed to do the specified action
               # action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               def allowed_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               # Return all the permissions that can be given to the role
               def setable_permissions
                 setable_permissions = Redmine::AccessControl.permissions - Redmine::AccessControl.public_permissions
                 setable_permissions -= Redmine::AccessControl.members_only_permissions if self.builtin == BUILTIN_NON_MEMBER
                 setable_permissions -= Redmine::AccessControl.loggedin_only_permissions if self.builtin == BUILTIN_ANONYMOUS
                 setable_permissions
               end
               # Find all the roles that can be given to a project member
               def self.find_all_givable
                 Role.givable.all
               end
               # Return the builtin 'non member' role.  If the role doesn't exist,
               # it will be created on the fly.
               def self.non_member
                 find_or_create_system_role(BUILTIN_NON_MEMBER, 'Non member')
               end
               # Return the builtin 'anonymous' role.  If the role doesn't exist,
               # it will be created on the fly.
               def self.anonymous
                 find_or_create_system_role(BUILTIN_ANONYMOUS, 'Anonymous')
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= permissions + Redmine::AccessControl.public_permissions.collect {|p| p.name}
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
               def check_deletable
                 raise "Can't delete role" if members.any?
                 raise "Can't delete builtin role" if builtin?
               end
               def self.find_or_create_system_role(builtin, name)
                 role = where(:builtin => builtin).first
                 if role.nil?
                   role = create(:name => name, :position => 0) do |r|
                     r.builtin = builtin
                   end
                   raise "Unable to create the #{name} role." if role.new_record?
                 end
                 role
               end
             end

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

             <%= error_messages_for 'role' %>
             <div class="box tabular">
             <% unless @role.builtin? %>
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.check_box :assignable %></p>
             <% end %>
             <p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
             <% if @role.new_record? && @roles.any? %>
             <p><label for="copy_workflow_from"><%= l(:label_copy_workflow_from) %></label>
-            <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %></p>
+            <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name, params[:copy_workflow_from] || @copy_from.try(:id))) %></p>
             <% end %>
             </div>
             <h3><%= l(:label_permissions) %></h3>
             <div class="box tabular" id="permissions">
             <% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %>
             <% perms_by_module.keys.sort.each do |mod| %>
                 <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
                 <% perms_by_module[mod].each do |permission| %>
                     <label class="floating">
                     <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
                     <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
                     </label>
                 <% end %>
                 </fieldset>
             <% end %>
             <br /><%= check_all_links 'permissions' %>
             <%= hidden_field_tag 'role[permissions][]', '' %>
             </div>

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

             <div class="contextual">
             <%= link_to l(:label_role_new), new_role_path, :class => 'icon icon-add' %>
             <%= link_to l(:label_permissions_report), {:action => 'permissions'}, :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><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td>
               <td align="center" style="width:15%;">
               <% unless role.builtin? %>
                 <%= reorder_links('role', {:action => 'update', :id => role}, :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)) -%>

test/functional/roles_controller_test.rb +25 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             require File.expand_path('../../test_helper', __FILE__)
             class RolesControllerTest < ActionController::TestCase
               fixtures :roles, :users, :members, :member_roles, :workflows, :trackers
               def setup
                 @controller = RolesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:roles)
                 assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
                 assert_tag :tag => 'a', :attributes => { :href => '/roles/1/edit' },
                                         :content => 'Manager'
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
               end
+              def test_new_with_copy
+                copy_from = Role.find(2)
+                get :new, :copy => copy_from.id.to_s
+                assert_response :success
+                assert_template 'new'
+                role = assigns(:role)
+                assert_equal copy_from.permissions, role.permissions
+                assert_select 'form' do
+                  # blank name
+                  assert_select 'input[name=?][value=]', 'role[name]'
+                  # edit_project permission checked
+                  assert_select 'input[type=checkbox][name=?][value=edit_project][checked=checked]', 'role[permissions][]'
+                  # add_project permission not checked
+                  assert_select 'input[type=checkbox][name=?][value=add_project]', 'role[permissions][]'
+                  assert_select 'input[type=checkbox][name=?][value=add_project][checked=checked]', 'role[permissions][]', 0
+                  # workflow copy selected
+                  assert_select 'select[name=?]', 'copy_workflow_from' do
+                    assert_select 'option[value=2][selected=selected]'
+                  end
+                end
+              end
               def test_create_with_validaton_failure
                 post :create, :role => {:name => '',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'}
                 assert_response :success
                 assert_template 'new'
                 assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' }
               end
               def test_create_without_workflow_copy
                 post :create, :role => {:name => 'RoleWithoutWorkflowCopy',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'}
                 assert_redirected_to '/roles'
                 role = Role.find_by_name('RoleWithoutWorkflowCopy')
                 assert_not_nil role
                 assert_equal [:add_issues, :edit_issues, :log_time], role.permissions
                 assert !role.assignable?
               end
               def test_create_with_workflow_copy
                 post :create, :role => {:name => 'RoleWithWorkflowCopy',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'},
                            :copy_workflow_from => '1'
                 assert_redirected_to '/roles'
                 role = Role.find_by_name('RoleWithWorkflowCopy')
                 assert_not_nil role
                 assert_equal Role.find(1).workflow_rules.size, role.workflow_rules.size
               end
               def test_edit
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_equal Role.find(1), assigns(:role)
               end
               def test_edit_invalid_should_respond_with_404
                 get :edit, :id => 999
                 assert_response 404
               end
               def test_update
                 put :update, :id => 1,
                             :role => {:name => 'Manager',
                                       :permissions => ['edit_project', ''],
                                       :assignable => '0'}
                 assert_redirected_to '/roles'
                 role = Role.find(1)
                 assert_equal [:edit_project], role.permissions
               end
               def test_update_with_failure
                 put :update, :id => 1, :role => {:name => ''}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 r = Role.create!(:name => 'ToBeDestroyed', :permissions => [:view_wiki_pages])
                 delete :destroy, :id => r
                 assert_redirected_to '/roles'
                 assert_nil Role.find_by_id(r.id)
               end
               def test_destroy_role_in_use
                 delete :destroy, :id => 1
                 assert_redirected_to '/roles'
                 assert_equal 'This role is in use and cannot be deleted.', flash[:error]
                 assert_not_nil Role.find_by_id(1)
               end
               def test_get_permissions
                 get :permissions
                 assert_response :success
                 assert_template 'permissions'
                 assert_not_nil assigns(:roles)
                 assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'permissions[3][]',
                                                              :value => 'add_issues',
                                                              :checked => 'checked' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'permissions[3][]',
                                                              :value => 'delete_issues',
                                                              :checked => nil }
               end
               def test_post_permissions
                 post :permissions, :permissions => { '0' => '', '1' => ['edit_issues'], '3' => ['add_issues', 'delete_issues']}
                 assert_redirected_to '/roles'
                 assert_equal [:edit_issues], Role.find(1).permissions
                 assert_equal [:add_issues, :delete_issues], Role.find(3).permissions
                 assert Role.find(2).permissions.empty?
               end
               def test_clear_all_permissions
                 post :permissions, :permissions => { '0' => '' }
                 assert_redirected_to '/roles'
                 assert Role.find(1).permissions.empty?
               end
               def test_move_highest
                 put :update, :id => 3, :role => {:move_to => 'highest'}
                 assert_redirected_to '/roles'
                 assert_equal 1, Role.find(3).position
               end
               def test_move_higher
                 position = Role.find(3).position
                 put :update, :id => 3, :role => {:move_to => 'higher'}
                 assert_redirected_to '/roles'
                 assert_equal position - 1, Role.find(3).position
               end
               def test_move_lower
                 position = Role.find(2).position
                 put :update, :id => 2, :role => {:move_to => 'lower'}
                 assert_redirected_to '/roles'
                 assert_equal position + 1, Role.find(2).position
               end
               def test_move_lowest
                 put :update, :id => 2, :role => {:move_to => 'lowest'}
                 assert_redirected_to '/roles'
                 assert_equal Role.count, Role.find(2).position
               end
             end

test/unit/role_test.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             require File.expand_path('../../test_helper', __FILE__)
             class RoleTest < ActiveSupport::TestCase
               fixtures :roles, :workflows
               def test_sorted_scope
                 assert_equal Role.all.sort, Role.sorted.all
               end
               def test_givable_scope
                 assert_equal Role.all.reject(&:builtin?).sort, Role.givable.all
               end
               def test_builtin_scope
                 assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).all.sort
                 assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).all.sort
               end
+              def test_copy_from
+                role = Role.find(1)
+                copy = Role.new.copy_from(role)
+                assert_nil copy.id
+                assert_equal '', copy.name
+                assert_equal role.permissions, copy.permissions
+                copy.name = 'Copy'
+                assert copy.save
+              end
               def test_copy_workflows
                 source = Role.find(1)
                 assert_equal 90, source.workflow_rules.size
                 target = Role.new(:name => 'Target')
                 assert target.save
                 target.workflow_rules.copy(source)
                 target.reload
                 assert_equal 90, target.workflow_rules.size
               end
               def test_permissions_should_be_unserialized_with_its_coder
                 Role::PermissionsAttributeCoder.expects(:load).once
                 Role.find(1).permissions
               end
               def test_add_permission
                 role = Role.find(1)
                 size = role.permissions.size
                 role.add_permission!("apermission", "anotherpermission")
                 role.reload
                 assert role.permissions.include?(:anotherpermission)
                 assert_equal size + 2, role.permissions.size
               end
               def test_remove_permission
                 role = Role.find(1)
                 size = role.permissions.size
                 perm = role.permissions[0..1]
                 role.remove_permission!(*perm)
                 role.reload
                 assert ! role.permissions.include?(perm[0])
                 assert_equal size - 2, role.permissions.size
               end
               def test_name
                 I18n.locale = 'fr'
                 assert_equal 'Manager', Role.find(1).name
                 assert_equal 'Anonyme', Role.anonymous.name
                 assert_equal 'Non membre', Role.non_member.name
               end
               def test_find_all_givable
                 assert_equal Role.all.reject(&:builtin?).sort, Role.find_all_givable
               end
               context "#anonymous" do
                 should "return the anonymous role" do
                   role = Role.anonymous
                   assert role.builtin?
                   assert_equal Role::BUILTIN_ANONYMOUS, role.builtin
                 end
                 context "with a missing anonymous role" do
                   setup do
                     Role.delete_all("builtin = #{Role::BUILTIN_ANONYMOUS}")
                   end
                   should "create a new anonymous role" do
                     assert_difference('Role.count') do
                       Role.anonymous
                     end
                   end
                   should "return the anonymous role" do
                     role = Role.anonymous
                     assert role.builtin?
                     assert_equal Role::BUILTIN_ANONYMOUS, role.builtin
                   end
                 end
               end
               context "#non_member" do
                 should "return the non-member role" do
                   role = Role.non_member
                   assert role.builtin?
                   assert_equal Role::BUILTIN_NON_MEMBER, role.builtin
                 end
                 context "with a missing non-member role" do
                   setup do
                     Role.delete_all("builtin = #{Role::BUILTIN_NON_MEMBER}")
                   end
                   should "create a new non-member role" do
                     assert_difference('Role.count') do
                       Role.non_member
                     end
                   end
                   should "return the non-member role" do
                     role = Role.non_member
                     assert role.builtin?
                     assert_equal Role::BUILTIN_NON_MEMBER, role.builtin
                   end
                 end
               end
             end

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