jro_apps/redmine Commit - r8093:7c00a4a11fc3

Restores migration broken by r8182 and removes default scope on Role (#9800)....

Jean-Philippe Lang -

r8093:7c00a4a11fc3

parent child

Context file:

r8093:7c00a4a11fc3

Collapse all files

app/controllers/roles_controller.rb +3 -3

              # Redmine - project management software
              # Copyright (C) 2006-2011  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
                before_filter :find_role, :only => [:edit, :update, :destroy]
                def index
                  @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
                  render :action => "index", :layout => false if request.xhr?
                end
                def new
                  # Prefills the form with 'Non member' role permissions
                  @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
-                 @roles = Role.all
+                 @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.workflows.copy(copy_from)
                    end
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to :action => 'index'
                  else
-                   @roles = Role.all
+                   @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
                verify :method => :delete, :only => :destroy, :redirect_to => { :action => :index }
                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.find(:all, :order => 'builtin, position')
+                 @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 +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2011  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
                # 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]
                ]
-               default_scope :order => 'builtin, position'
+               named_scope :sorted, {:order => 'builtin, position'}
                named_scope :givable, { :conditions => "builtin = 0", :order => 'position' }
                named_scope :builtin, lambda { |*args|
                  compare = 'not' if args.first == true
                  { :conditions => "#{compare} builtin = 0" }
                }
                before_destroy :check_deletable
                has_many :workflows, :dependent => :delete_all do
                  def copy(source_role)
                    Workflow.copy(nil, source_role, nil, proxy_owner)
                  end
                end
                has_many :member_roles, :dependent => :destroy
                has_many :members, :through => :member_roles
                acts_as_list
                serialize :permissions, Array
                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)}
                def permissions
                  read_attribute(:permissions) || []
                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)
                  role ? position <=> role.position : -1
                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
                  find(:all, :conditions => {:builtin => 0}, :order => 'position')
                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 = first(:conditions => {:builtin => builtin})
                  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

db/migrate/020_add_role_position.rb +1 -1

              class AddRolePosition < ActiveRecord::Migration
                def self.up
                  add_column :roles, :position, :integer, :default => 1
-                 Role.update_all("position = (SELECT COUNT(*) FROM #{Role.table_name} r WHERE r.id < id) + 1")
+                 Role.all.each_with_index {|role, i| role.update_attribute(:position, i+1)}
                end
                def self.down
                  remove_column :roles, :position
                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