projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 2.4.2 upgrade notes formatting refs #19330
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
proxy_work_unit.rb
diff --git
a/apps/workbench/app/models/proxy_work_unit.rb
b/apps/workbench/app/models/proxy_work_unit.rb
index 8d1c1e30ec2a9f58159af24b61bc111b6ffa6ec3..adf0bd7d671db15203b1ba26e2a6188c71cd5815 100644
(file)
--- a/
apps/workbench/app/models/proxy_work_unit.rb
+++ b/
apps/workbench/app/models/proxy_work_unit.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class ProxyWorkUnit < WorkUnit
require 'time'
class ProxyWorkUnit < WorkUnit
require 'time'
@@
-251,7
+255,9
@@
class ProxyWorkUnit < WorkUnit
if state_label == 'Complete'
resp << "completed in "
elsif state_label == 'Failed'
if state_label == 'Complete'
resp << "completed in "
elsif state_label == 'Failed'
- resp << "failed after "
+ resp << "failed after "
+ elsif state_label == 'Cancelled'
+ resp << "was cancelled after "
else
resp << "has been active for "
end
else
resp << "has been active for "
end
@@
-272,7
+278,11
@@
class ProxyWorkUnit < WorkUnit
end
if is_failed?
end
if is_failed?
- resp << " Check the Log tab for more detail about why it failed."
+ if runtime_status.andand[:error]
+ resp << " Check the error information below."
+ else
+ resp << " Check the Log tab for more detail about why it failed."
+ end
end
resp << "</p>"
end
resp << "</p>"