CDPP / AMDA_IHM

Commit 232cf098ab377059b399d919a58164ea7dbf26b5

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

Another fix for plot request duplication

Showing 2 changed files with 18 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/MultiplotRequestObject.js
  Diff comments   View file @232cf09
... ... @@ -57,7 +57,7 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', {
57 57 newPlotNode = Ext.create('amdaModel.PlotNode', {
58 58 leaf : true
59 59 });
60   - var data = Ext.apply({}, plotNode.get('object').getData(), plotNode.get('object').getAssociatedData());
  60 + var data = plotNode.get('object').getJsonValues();
61 61 newPlotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', data));
62 62 plotNode.get('object').reject();
63 63 me.plots().remove(plotNode);
... ...
js/app/views/PlotComponents/PlotTabContent.js
  Diff comments   View file @232cf09
... ... @@ -21,6 +21,9 @@ Ext.define('amdaPlotComp.PlotTabContent', {
21 21 //Link to the Plot Node
22 22 plotNode: null,
23 23  
  24 + //Save initial request data to have the possibility to reject all modifications
  25 + initialObjectData: null,
  26 +
24 27 timeSelector: null,
25 28 plotTree: null,
26 29 plotElement: null,
... ... @@ -69,6 +72,7 @@ Ext.define('amdaPlotComp.PlotTabContent', {
69 72 //update existing request
70 73 this.updateTimeObject();
71 74 this.plotNode.update({plot: true, callback: function() {
  75 + me.setPlotNode(me.plotNode); //to update initial request data
72 76 me.plotTabPanel.updatePlotTabs();
73 77 }});
74 78 return;
... ... @@ -113,6 +117,7 @@ Ext.define('amdaPlotComp.PlotTabContent', {
113 117 if (toRename) {
114 118 this.updateTimeObject();
115 119 this.plotNode.update({plot: true, callback: function() {
  120 + me.setPlotNode(me.plotNode); //to update initial request data
116 121 me.plotTabPanel.updatePlotTabs();
117 122 }});
118 123 }
... ... @@ -124,15 +129,17 @@ Ext.define('amdaPlotComp.PlotTabContent', {
124 129 return;
125 130 var newPlotNode = plotModule.linkedNode.get('object').duplicatePlot(this.plotNode);
126 131 if (newPlotNode) {
127   - var oldPlotNode = this.plotNode;
128   - this.plotNode = newPlotNode;
129   - this.updateTimeObject();
130   - oldPlotNode.reject();
  132 + //Reject modifications in old plot node
  133 + this.plotNode.reject();
  134 + this.plotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', this.initialObjectData));
  135 + //Set new plot node
  136 + this.setPlotNode(newPlotNode);
131 137 }
132 138 }
133 139 this.updateTimeObject();
134 140 this.plotNode.create({callback: function() {
135 141 me.plotNode.commit();
  142 + me.setPlotNode(me.plotNode); //to update initial request data
136 143 me.plotTabPanel.updatePlotTabs();
137 144 me.updateUI();
138 145 }});
... ... @@ -147,8 +154,13 @@ Ext.define('amdaPlotComp.PlotTabContent', {
147 154 this.treePlot.buildTree(this.plotNode.get('object'));
148 155 },
149 156  
  157 + setPlotNode : function(plotNode) {
  158 + this.initialObjectData = plotNode.get('object').getJsonValues();
  159 + this.plotNode = plotNode;
  160 + },
  161 +
150 162 init : function(config) {
151   - this.plotNode = config.plotNode;
  163 + this.setPlotNode(config.plotNode);
152 164 this.tabIndex = config.tabIndex;
153 165 this.plotTabPanel = config.plotTabPanel;
154 166  
... ...