CDPP / AMDA_IHM

Commit a038d0e23442e7c30646aeefaab5c91d2abcda05

Authored by Elena.Budnik
1 parent bab90f22
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine #5687

Showing 1 changed file with 5 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/models/BkgJobNode.js
  Diff comments   View file @a038d0e
... ... @@ -42,7 +42,7 @@ Ext.define('amdaModel.BkgJobNode', {
42 42 }
43 43 },
44 44 fields: [
45   - // name, id, moduleId, object> from parent
  45 + // name, id, moduleId, object > from parent
46 46 { name : 'jobType', type : 'string' },
47 47 { name : 'processId', type : 'string' },
48 48 { name : 'status', type : 'string' },
... ... @@ -70,7 +70,7 @@ Ext.define('amdaModel.BkgJobNode', {
70 70 break;
71 71 case amdaModel.BkgJobNode.STATUS_LIST.DONE:
72 72 // set status
73   - // this.set('status',amdaModel.BkgJobNode.STATUS_LIST.DONE);
  73 + // this.set('status',amdaModel.BkgJobNode.STATUS_LIST.DONE);
74 74 this.set('iconCls','icon-done');
75 75 break;
76 76 default :
... ... @@ -79,6 +79,9 @@ Ext.define('amdaModel.BkgJobNode', {
79 79 this.set('iconCls','icon-pend');
80 80 }
81 81  
  82 + if (!this.get('processId') && this.get('id'))
  83 + this.set('processId', this.get('id'));
  84 +
82 85 if (config) this.set('jobType', config.jobType);
83 86 else this.set('jobType',this.get('jobType'));
84 87 }
... ... @@ -266,7 +269,6 @@ Ext.define('amdaModel.BkgJobNode', {
266 269 // Show Result
267 270 editNode : function(isNewTab, isInteractive) {
268 271 var me = this;
269   -
270 272 if (isInteractive) {
271 273 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interactive_plot.id, true, function(module) {
272 274 if (isNewTab) {
... ...