CDPP / AMDA_IHM

Commit 75a90e82c8a677be056c3c2ba378cc039d073e21

Authored by Hacene SI HADJ MOHAND
1 parent d9a1b6f6
Exists in master and in 84 other branches 10098, 10178, 5390, 6629, 7494, 7497, 7616, 8459, 8528, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912, rm_6912_bis, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

ticket ok

Showing 1 changed file with 20 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/views/VisuUI.js
  Diff comments   View file @75a90e8
... ... @@ -37,7 +37,7 @@ Ext.define('amdaUI.VisuUI', {
37 37 updateObject: function () {
38 38 return true;
39 39 },
40   - addCatalog: function(cat) {
  40 + addCatalog: function (cat) {
41 41 this.setObject(cat)
42 42 },
43 43  
... ... @@ -329,9 +329,25 @@ Ext.define('amdaUI.VisuUI', {
329 329 return false;
330 330 var visuModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.visu.id);
331 331 if (visuModule) {
332   - var dropObject = data.records[0];
333   - dropObject.set('name', data.records[0].get('text'));
334   - visuModule.addCatalog(dropObject);
  332 +
  333 + var catNode = data.records[0];
  334 + AmdaAction.getObject( catNode.get('id'), catNode.get('nodeType'), function(result, remoteEvent) {
  335 + var catObj = Ext.create(catNode.get('objectDataModel'), result);
  336 + if(catObj !== null){
  337 + visuModule.addCatalog(catObj);
  338 + }else{
  339 + Ext.MessageBox.show({title: 'Warning',
  340 + msg: '<br/>Undifined Catalog '+catNode.get('text'),
  341 + width: 300,
  342 + buttons: Ext.MessageBox,
  343 + fn: me.overwriteProcess,
  344 + icon: Ext.MessageBox.WARNING,
  345 + scope: me
  346 + });
  347 + return false;
  348 + }
  349 +
  350 + }, this);
335 351 }
336 352 return true;
337 353 }
... ...