Synchronize plot request title

Benjamin Renard
1 parent 9705c573
Showing 6 changed files with 51 additions and 14 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/PlotNode.js
js/app/models/PlotObjects/MultiplotRequestObject.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -232,5 +232,14 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
                 me.linkedNode.get('object').plots().add(plotNode);
             });
         }
+    },
+
+    updateTabs: function() {
+        var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().updateTabs();
+        }
     }
 });
@@ -107,5 +107,18 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         myDesktopApp.getLoadedModule(this.get('moduleId'),true, function (module) {
             module.editPlot(me);
         });
-    }
+    },
+
+    //Override rename
+    rename: function(value,callBackFn)
+    {
+        var me = this;
+        var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+        AmdaAction.renameObject(dataToSend, function(result) {
+            callBackFn(result);
+            myDesktopApp.getLoadedModule(me.get('moduleId'),true, function (module) {
+                module.updateTabs();
+            });
+        });
+     }
 });
@@ -51,17 +51,13 @@ Ext.define(&#39;amdaPlotObj.MultiplotRequestObject&#39;, {
  
     duplicatePlot: function(plotNode) {
         var me = this;
-        var clonedObject = plotNode.get('object').copy();
         var newPlotNode = null;
         this.plots().each(function(node, index) {
             if (node == plotNode) {
-                plotNode.get('object').reject();
                 newPlotNode = Ext.create('amdaModel.PlotNode', {
                     leaf : true
                 });
-                newPlotNode.set('object',clonedObject);
-                me.plots().removeAt(index);
-                me.plots().insert(index, newPlotNode);
+                newPlotNode.set('object', plotNode.get('object'));
                 return false;
             }
         });
@@ -59,6 +59,8 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     },
  
     savePlot : function() {
+        var me = this;
+
         this.updateTimeObject();
         var object = this.plotNode.get('object');
         if (!object)
@@ -66,12 +68,13 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
  
         if ((object.get('id') != '') && (this.plotNode.get('text') == object.get('name'))) {
             //update existing request
-            this.plotNode.update({plot: true});
+            this.plotNode.update({plot: true, callback: function() {
+                me.plotTabPanel.updatePlotTabs();
+            }});
             return;
         }
  
         //save new request
-        var me = this;
         this.plotNode.isValidName(object.get('name'), function (res) {
             if (!res) {
                 myDesktopApp.errorMsg('Error during object validation');
@@ -106,8 +109,11 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     },
  
     saveProcess : function(toRename) {
+        var me = this;
         if (toRename) {
-            this.plotNode.update({plot: true});
+            this.plotNode.update({plot: true, callback: function() {
+                me.plotTabPanel.updatePlotTabs();
+            }});
         }
         else {
             if (this.plotNode.get('object').get('id') != '') {
@@ -121,9 +127,10 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
                     this.updateUI();
                 }
             }
-            this.plotNode.create();
+            this.plotNode.create({callback: function() {
+                me.plotTabPanel.updatePlotTabs();
+            }});
         }
-        this.plotTabPanel.updatePlotTabs();
     },
  
     updateUI : function() {
@@ -20,6 +20,8 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
  
     //Multiplot object
     multiplot_object: null,
+
+    tabbar_destroy : false,
  
     constructor: function(config) {
         this.init(config);	    
@@ -88,8 +90,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
                     if (tab.items.getAt(0).plotNode)
                         this.multiplot_object.removePlotByInternalId(tab.items.getAt(0).plotNode.internalId);
                 },
-                destroy: function(tab, eOpts) {	
-                    this.updatePlotTabs();
+                destroy: function(tab, eOpts) {
+                    if (!this.tabbar_destroy)
+                        this.updatePlotTabs();
                 }
             }
         });
@@ -154,7 +157,12 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
                             var tabContent = me.addPlotNode(me.multiplot_object.createNewPlot(), true);
                         }
                     }
-                ]
+                ],
+                listeners: {
+                    beforedestroy: function(tabbar, eOpts) {
+                        me.tabbar_destroy = true;
+                    }
+                }
             }
         };
  
@@ -106,6 +106,10 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     updateObject : function(){
         this.plotTabs.updateTimeObjects();
     },
+
+    updateTabs : function() {
+        this.plotTabs.updatePlotTabs();
+    },
  
     addTT : function(newTTName,newTTid,timeSelectorId) {
         var crtTimeSelector = Ext.getCmp(timeSelectorId);