CDPP / AMDA_IHM

Commit 7c762483e11bbffc10e321739167c00e7578b916

Authored by Benjamin Renard
1 parent 0c99c4b7
Exists in master and in 102 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, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot-request, special-params, test-merge, ws_get_catalog

Fix some bugs related to the save of a plot request

Showing 4 changed files with 32 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotNode.js
  Diff comments   View file @7c76248
... ... @@ -11,7 +11,7 @@ Ext.define('amdaModel.PlotNode', {
11 11 extend: 'amdaModel.ExecutableNode',
12 12  
13 13 fields : [
14   - {name : 'tabs', type:'auto', defaultValue:[], persist: false}
  14 + {name : 'tabs', type:'auto', defaultValue:false, persist: false}
15 15 ],
16 16  
17 17 statics: {
... ... @@ -128,6 +128,18 @@ Ext.define('amdaModel.PlotNode', {
128 128 default:
129 129 break;
130 130 }
  131 + },
  132 +
  133 + rename: function(value,callBackFn) {
  134 + var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
  135 + var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value, parent : this.data.parentId, leaf: !isFolder, nodeType: this.get('nodeType')};
  136 + AmdaAction.renameObject(dataToSend, callBackFn);
  137 + },
  138 +
  139 + renameDD: function(parentId, callBackFn) {
  140 + var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
  141 + var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: !isFolder, nodeType: this.get('nodeType')};
  142 + AmdaAction.renameObject(dataToSend, callBackFn);
131 143 }
132 144  
133 145 });
... ...
js/app/views/ExplorerUI.js
  Diff comments   View file @7c76248
... ... @@ -354,6 +354,7 @@ Ext.define('amdaUI.ExplorerUI', {
354 354 case 'remoteParam' :
355 355 case 'remoteSimuParam' :
356 356 case 'myData' :
  357 + case 'plottab' :
357 358 return false;
358 359 default :
359 360 if (draggedRecord.data.id == targetNode.data.nodeType+'-treeRootNode')
... ...
js/app/views/PlotComponents/PlotTabPanel.js
  Diff comments   View file @7c76248
... ... @@ -92,11 +92,25 @@ Ext.define('amdaPlotComp.PlotTabPanel', {
92 92  
93 93 updatePlotTabs: function()
94 94 {
  95 + var me = this;
  96 + var haveSelectedTab = false;
  97 + this.object.tabs().each(function (rec, index) {
  98 + if (rec.get('id') == me.object.get('active-tab-id')) {
  99 + haveSelectedTab = true;
  100 + }
  101 + });
  102 +
95 103 var i = 0;
96 104 for (i = 0; i < this.items.getCount(); ++i)
97 105 {
98   - var tabNumber = i+1;
99 106 var tabObj = this.object.tabs().getAt(i);
  107 + if (!haveSelectedTab) {
  108 + //Set first tab as the selected one
  109 + this.setActiveTab(this.items.getAt(i));
  110 + this.object.set('active-tab-id', tabObj.get('id'));
  111 + haveSelectedTab = true;
  112 + }
  113 + var tabNumber = i+1;
100 114 this.items.getAt(i).setTitle((tabObj.get('tab-name') != '') ? tabObj.get('tab-name') : 'Plot '+tabNumber);
101 115 this.items.getAt(i).items.getAt(0).setTabObject(this.object.tabs().getAt(i));
102 116 }
... ...
php/classes/RequestMgr.php
  Diff comments   View file @7c76248
... ... @@ -190,7 +190,7 @@ class RequestMgr extends AmdaObjectMgr
190 190 * Make new request/condition resource file (JSON!!) and add it to content file
191 191 * ATTENTION : it is not DD parameter!!!
192 192 */
193   - protected function createParameter($p)
  193 + protected function createParameter($p, $folder)
194 194 {
195 195 if ($this -> objectExistsByName($p->name))
196 196 {
... ... @@ -230,7 +230,7 @@ class RequestMgr extends AmdaObjectMgr
230 230 if (isset($p->tabs)) {
231 231 foreach ($p->tabs as $index => $tab) {
232 232 $additional['tabs'][$index] = array(
233   - "name" => "Plot ".($index+1),
  233 + "name" => (!empty($tab->{'tab-name'})) ? $tab->{'tab-name'} : "Plot ".($index+1),
234 234 "id" => $tab->id,
235 235 );
236 236 }
... ... @@ -243,7 +243,7 @@ class RequestMgr extends AmdaObjectMgr
243 243 $file = fopen($this->descFileName, 'w');
244 244 fwrite($file, json_encode($p));
245 245 fclose($file);
246   -
  246 +
247 247 $this -> addToContent($p, $folder);
248 248  
249 249 return array('id' => $this->id, 'info' => $info) + $additional;
... ...