Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove publish validator. Add can_cancel/can_publish checking to cancel/publish methods. Refs #80

This commit is contained in:
Pavel Chipiga 2011-12-22 04:08:11 +02:00
parent 687fa3e000
commit 96d458875e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/build_list.rb
View File

@ -12,9 +12,6 @@ class BuildList < ActiveRecord::Base
validate lambda { validate lambda {
errors.add(:bpl, I18n.t('flash.build_list.wrong_platform')) if pl.platform_type == 'main' && pl_id != bpl_id errors.add(:bpl, I18n.t('flash.build_list.wrong_platform')) if pl.platform_type == 'main' && pl_id != bpl_id
} }
validate lambda {
errors.add(:bpl, I18n.t('flash.build_list.can_not_published')) if status == BUILD_PUBLISHED && status_was != BuildServer::SUCCESS
}
# The kernel does not send these statuses directly # The kernel does not send these statuses directly
BUILD_CANCELED = 5000 BUILD_CANCELED = 5000
@ -111,20 +108,20 @@ class BuildList < ActiveRecord::Base
end end
def publish def publish
return false unless can_publish?
has_published = BuildServer.publish_container bs_id has_published = BuildServer.publish_container bs_id
update_attribute(:status, BUILD_PUBLISH) if has_published == 0 update_attribute(:status, BUILD_PUBLISH) if has_published == 0
return has_published == 0 return has_published == 0
end end
def can_publish? def can_publish?
status == BuildServer::SUCCESS or status == FAILED_PUBLISH status == BuildServer::SUCCESS or status == FAILED_PUBLISH
end end
def cancel def cancel
return false unless can_cancel?
has_canceled = BuildServer.delete_build_list bs_id has_canceled = BuildServer.delete_build_list bs_id
update_attribute(:status, BUILD_CANCELED) if has_canceled == 0 update_attribute(:status, BUILD_CANCELED) if has_canceled == 0
return has_canceled == 0 return has_canceled == 0
end end