Commit 507c35af9bc4205a6c86686d68b52c90430e84d9
1 parent
d64f3f15
Exists in
master
and in
17 other branches
#11345 - Done
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
js/app/controllers/JobsMgr.js
| @@ -78,7 +78,7 @@ Ext.define('amdaDesktop.JobsMgr', { | @@ -78,7 +78,7 @@ Ext.define('amdaDesktop.JobsMgr', { | ||
| 78 | // Update from Server Jobs Running and Finished | 78 | // Update from Server Jobs Running and Finished |
| 79 | if (res.nFinished > 0 || res.nError) { | 79 | if (res.nFinished > 0 || res.nError) { |
| 80 | Ext.Array.each(res.jobsFinished, function (job) { | 80 | Ext.Array.each(res.jobsFinished, function (job) { |
| 81 | - | 81 | + console.log(job.status) |
| 82 | /** | 82 | /** |
| 83 | * Called asynchronously on each finished job | 83 | * Called asynchronously on each finished job |
| 84 | * @param {Job} job The finished job. | 84 | * @param {Job} job The finished job. |
| @@ -101,7 +101,7 @@ Ext.define('amdaDesktop.JobsMgr', { | @@ -101,7 +101,7 @@ Ext.define('amdaDesktop.JobsMgr', { | ||
| 101 | type = 'unknown' | 101 | type = 'unknown' |
| 102 | } | 102 | } |
| 103 | strDate = Ext.Date.format(new Date(job.stop), 'Y-m-d H:i:s: ') | 103 | strDate = Ext.Date.format(new Date(job.stop), 'Y-m-d H:i:s: ') |
| 104 | - message = strDate + type + ' ' + job.name + ' completed' | 104 | + message = strDate + type + ' ' + job.name + ((job.status == "error") ? " request aborted" : ' completed') |
| 105 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, | 105 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, |
| 106 | function (mod) { | 106 | function (mod) { |
| 107 | mod.addLogMessage(message) | 107 | mod.addLogMessage(message) |