#759: some fixes
This commit is contained in:
parent
da4eb1852e
commit
60f2ab3d96
|
@ -322,6 +322,7 @@ class BuildList < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def human_duration
|
||||
duration ||= current_duration
|
||||
I18n.t("layout.build_lists.human_duration", {:hours => (duration/3600).to_i, :minutes => (duration%3600/60).to_i})
|
||||
end
|
||||
|
||||
|
@ -391,7 +392,8 @@ class BuildList < ActiveRecord::Base
|
|||
:commit_hash => commit_hash,
|
||||
:build_requires => build_requires,
|
||||
:include_repos => include_repos_hash,
|
||||
:bplname => build_for_platform.name
|
||||
:bplname => build_for_platform.name,
|
||||
:user => {:uname => user.uname, :email => user.email}
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ module AbfWorker
|
|||
worker_queue_class,
|
||||
abf_worker_args
|
||||
)
|
||||
if deleted
|
||||
if deleted == 1
|
||||
update_attributes({:status => self.class::BUILD_CANCELED})
|
||||
else
|
||||
send_stop_signal
|
||||
|
|
|
@ -63,4 +63,4 @@ module AbfWorker
|
|||
end
|
||||
|
||||
end
|
||||
endх
|
||||
end
|
Loading…
Reference in New Issue