projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3889-functional-testing-TC' into 3889-functional-testing
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
job.rb
diff --git
a/apps/workbench/app/models/job.rb
b/apps/workbench/app/models/job.rb
index 1006660696d000f7ed8f85cfc63cc09148fe36e8..d3d38b0b2dbc6109e54cf94afd1ba890e7b3622e 100644
(file)
--- a/
apps/workbench/app/models/job.rb
+++ b/
apps/workbench/app/models/job.rb
@@
-42,13
+42,17
@@
class Job < ArvadosBase
arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
end
arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
end
- def s
tate
-
Job::state(self
)
+ def s
elf.queue
+
arvados_api_client.unpack_api_response arvados_api_client.api("jobs/", "queue", {"_method"=> "GET"}
)
end
def self.state job
end
def self.state job
+ if job.respond_to? :state and job.state
+ return job.state
+ end
+
if not job[:cancelled_at].nil?
if not job[:cancelled_at].nil?
- "Canceled"
+ "Cancel
l
ed"
elsif not job[:finished_at].nil? or not job[:success].nil?
if job[:success]
"Completed"
elsif not job[:finished_at].nil? or not job[:success].nil?
if job[:success]
"Completed"