Merge pull request #435 from warpc/434-user_build_priority

[refs #434] Ability to set individual build priority for user
This commit is contained in:
Vladimir Sharshov 2012-05-05 04:49:44 -07:00
commit 7ccb37d428
3 changed files with 15 additions and 6 deletions

View File

@ -48,7 +48,7 @@ class Projects::BuildListsController < Projects::BaseController
@build_list.commit_hash = @project.git_repository.commits(@build_list.project_version.match(/^latest_(.+)/).to_a.last || @build_list.project_version).first.id if @build_list.project_version
@build_list.bpl = bpl; @build_list.arch = arch; @build_list.user = current_user
@build_list.include_repos = @build_list.include_repos.select {|ir| @build_list.bpl.repository_ids.include? ir.to_i}
@build_list.priority = 100 # User builds more priority than mass rebuild with zero priority
@build_list.priority = current_user.build_priority # User builds more priority than mass rebuild with zero priority
flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :bpl => bpl.name, :pl => @build_list.pl}
if @build_list.save
notices << t("flash.build_list.saved", flash_options)

View File

@ -0,0 +1,11 @@
class AddBuildPriorityToUsers < ActiveRecord::Migration
def up
add_column :users, :build_priority, :integer, :default => 50
User.update_all :build_priority => 50
end
def down
remove_column :users, :build_priority
end
end

View File

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120425190938) do
ActiveRecord::Schema.define(:version => 20120505101650) do
create_table "activity_feeds", :force => true do |t|
t.integer "user_id", :null => false
@ -345,10 +345,8 @@ ActiveRecord::Schema.define(:version => 20120425190938) do
t.integer "failed_attempts", :default => 0
t.string "unlock_token"
t.datetime "locked_at"
t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.string "authentication_token"
t.integer "build_priority", :default => 50
end
add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token"