Reset plot request modifications when PlotUI is closed (#8772) + Fix modifications check

Benjamin Renard
1 parent e2a002b9
Showing 4 changed files with 15 additions and 2 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -210,6 +210,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
         var win = desktop.getWindow(this.id);
         if (win) {
             // Plot UI is opened => add plot in a new tab
+            me.linkedNode.get('object').plots().add(plotNode);
             me.getUiContent().editPlot(plotNode);
             win.show();
         }
@@ -256,6 +256,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
                 afterrender: function(comp, eOpts) {
                     this.updateUI();
                 },
+                beforedestroy: function(comp, eOpts) {
+                    this.resetModif();
+                },
                 scope: this
             }
         };
@@ -48,6 +48,15 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
             }
         }
     },
+
+    isDirty : function() {
+        var dirty = false;
+        this.multiplot_object.plots().each(function (rec, index) {
+            if (rec.get('object').get('id') != '')
+                dirty |= rec.get('object').isDirty();
+        });
+        return dirty;
+    },
  
     addPlotNode: function(plotNode, selectTab)
     {
@@ -96,8 +96,8 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
         var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
         if (module)
             module.closeInteractiveSession();
-	
-        return this.object.isDirty();
+
+        return this.plotTabs.isDirty();
     },
  
     /**