CDPP / AMDA_IHM

Commit fd6c7cd165b7d99d6064668c2493086d7dea5432

Authored by Elena.Budnik
1 parent a56f041d
Exists in master and in 109 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, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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

delete not needed field is-plot

Showing 2 changed files with 3 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @fd6c7cd
... ... @@ -31,8 +31,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
31 31 {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
32 32 {name: 'last-tab-id', type: 'int', defaultValue: 0},
33 33 {name: 'active-tab-id', type: 'int', defaultValue: 1},
34   - {name: 'all-in-one', type: 'boolean', defaultValue: false},
35   - {name: 'is-plot', type: 'boolean', defaultValue: true}
  34 + {name: 'all-in-one', type: 'boolean', defaultValue: false}
36 35 ],
37 36  
38 37 hasMany: {
... ... @@ -156,7 +155,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
156 155  
157 156 requestValues['tabs'] = [];
158 157  
159   - if (this.get('all-in-one') || this.get('is-plot')) {
  158 + if (this.get('all-in-one')) {
160 159 this.tabs().each(function (tab, index) {
161 160 requestValues['tabs'][index] = tab.getJsonValues();
162 161 });
... ...
js/app/views/PlotUI.js
  Diff comments   View file @fd6c7cd
... ... @@ -70,8 +70,6 @@ Ext.define('amdaUI.PlotUI', {
70 70 * save method called by Save button to launch the save process
71 71 */
72 72 saveProcess : function(toRename) {
73   - this.object.set('is-plot', false);
74   -
75 73 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
76 74 if (!plotModule)
77 75 return;
... ... @@ -120,7 +118,7 @@ Ext.define('amdaUI.PlotUI', {
120 118 doPlot : function(){
121 119  
122 120 this.updateObject();
123   - this.object.set('is-plot', true);
  121 + this.object.set('all-in-one', true);
124 122 this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
125 123 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
126 124 if (plotModule)
... ...