CDPP / AMDA_IHM

Commit 134b0d677df356c9e2a37ac37e537e5737bcf3ad

Authored by Benjamin Renard
1 parent a9285c23
Exists in master and in 99 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, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Fix typo (#7238)

Showing 1 changed file with 3 additions and 11 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @134b0d6
... ... @@ -296,7 +296,7 @@ Ext.define('amdaModel.InteractiveNode', {
296 296 // set ownerTree panel as the active tab - to enable selection of this node his ownerTree must have a view
297 297 this.myGetOwnerTree().ownerCt.setActiveTab(this.myGetOwnerTree());
298 298 }
299   - if(opt.notDisplayMsg){
  299 + if(opt && opt.notDisplayMsg){
300 300 //do nothing
301 301 }else{
302 302 Ext.Msg.alert('Complete', 'New object '+this.get('object').get('name')+' has been created');
... ... @@ -459,16 +459,7 @@ Ext.define('amdaModel.InteractiveNode', {
459 459 {
460 460 if (node.get('disable')) return;
461 461 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
462   - if (!myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.plot.id)) {
463   - var request = Ext.create(amdaPlotObj.PlotRequestObject.$className);
464   - var newNode = Ext.create(amdaModel.PlotNode.$className, { object : request });
465   - // edit newNode into Plot Module with node as contextNode
466   - newNode.editInModule();
467   - if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && node.get('isParameter')) {
468   - module.getUiContent().setTimeFromData(node.getTimeFromNode(node));
469   - }
470   - }
471   - module.getUiContent().addParameter(node);
  462 + module.addParameterToPlot(node);
472 463 });
473 464 },
474 465  
... ... @@ -780,6 +771,7 @@ Ext.define('amdaModel.InteractiveNode', {
780 771 */
781 772 getObjectCallback : function(result,remoteEvent)
782 773 {
  774 + console.log('getObjectCallback');
783 775 var t = remoteEvent.getTransaction();
784 776  
785 777 if (result) {
... ...