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

app/controllers/roles_controller.rb +3 -3

               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
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index'
                 else
-                  @roles = Role.all
+                  @roles = Role.sorted.all
                   render :action => 'new'
                 end
               end
               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|

app/models/role.rb +1 -1

                 ['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

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

General Comments 0

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

No TODOs yet

	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