From 34ba5bef2401a430890c0d67d98ffb034fd6ca0f Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Fri, 15 Apr 2016 19:28:08 +0530
Subject: [PATCH] Improvised the data clean up, in some cases, it was calling
 validation due to internal 'set' function call from the internal 'reset'
 function.

We will stop the session management, before doing any clean up for
ignoring such events.
---
 web/pgadmin/browser/static/js/datamodel.js    | 22 ++++++++++++-------
 .../templates/browser/js/collection.js        |  2 +-
 .../browser/templates/browser/js/node.js      |  6 ++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/web/pgadmin/browser/static/js/datamodel.js b/web/pgadmin/browser/static/js/datamodel.js
index 6eb3ae5a9..71bd959c9 100644
--- a/web/pgadmin/browser/static/js/datamodel.js
+++ b/web/pgadmin/browser/static/js/datamodel.js
@@ -200,8 +200,12 @@ function(_, pgAdmin, $, Backbone) {
         return self;
       },
       // Create a reset function, which allow us to remove the nested object.
-      reset: function() {
+      reset: function(opts) {
         var obj;
+
+        if (opts && opts.stop)
+            this.stopSession();
+
         for(id in this.objects) {
           obj = this.get(id);
 
@@ -210,19 +214,19 @@ function(_, pgAdmin, $, Backbone) {
               obj.reset();
               delete obj;
             } else if (obj instanceof Backbone.Model) {
-              obj.clear({silent: true});
+              obj.clear(opts);
               delete obj;
             } else if (obj instanceof pgBrowser.DataCollection) {
-              obj.reset({silent: true});
+              obj.reset(opts);
               delete obj;
             } else if (obj instanceof Backbone.Collection) {
               obj.each(function(m) {
                 if (m instanceof Bakbone.DataModel) {
                   obj.reset();
-                  obj.clear({silent: true});
+                  obj.clear(opts);
                 }
               });
-              Backbone.Collection.prototype.reset.apply(obj, {silent: true});
+              Backbone.Collection.prototype.reset.apply(obj, {opts});
               delete obj;
             }
           }
@@ -259,7 +263,7 @@ function(_, pgAdmin, $, Backbone) {
         var res = Backbone.Model.prototype.set.call(this, key, val, options);
         this._changing = false;
 
-        if ((opts&& opts.intenal) || !this.trackChanges) {
+        if ((opts&& opts.internal) || !this.trackChanges) {
           return true;
         }
 
@@ -788,13 +792,15 @@ function(_, pgAdmin, $, Backbone) {
       // Override the reset function, so that - we can reset the model
       // properly.
       reset: function(opts) {
+        if (opts && opts.stop)
+            this.stopSession();
         this.each(function(m) {
           if (!m)
             return;
           if (m instanceof pgBrowser.DataModel) {
-            m.reset();
+            m.reset(opts);
           } else {
-            m.clear({silent: true});
+            m.clear(opts);
           }
         });
         Backbone.Collection.prototype.reset.apply(this, arguments);
diff --git a/web/pgadmin/browser/templates/browser/js/collection.js b/web/pgadmin/browser/templates/browser/js/collection.js
index cb9b65047..620653c9f 100644
--- a/web/pgadmin/browser/templates/browser/js/collection.js
+++ b/web/pgadmin/browser/templates/browser/js/collection.js
@@ -80,7 +80,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
 
       if (view) {
         // Release the view
-        view.remove({data: true});
+        view.remove({data: true, internal: true, silent: true});
         // Deallocate the view
         delete view;
         view = null;
diff --git a/web/pgadmin/browser/templates/browser/js/node.js b/web/pgadmin/browser/templates/browser/js/node.js
index 2ef8c8148..0b5251980 100644
--- a/web/pgadmin/browser/templates/browser/js/node.js
+++ b/web/pgadmin/browser/templates/browser/js/node.js
@@ -652,7 +652,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
           // creating new view.
           if (view) {
             // Release the view
-            view.remove({data: true});
+            view.remove({data: true, internal: true, silent: true});
             // Deallocate the view
             delete view;
             view = null;
@@ -763,7 +763,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
           // creating the new view.
           if (view) {
             // Release the view
-            view.remove({data: true});
+            view.remove({data: true, internal: true, silent: true});
             // Deallocate the view
             delete view;
             view = null;
@@ -1157,7 +1157,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
               view = j && j.data('obj-view');
 
           if (view) {
-            view.remove({data: true});
+            view.remove({data: true, internal: true, silent: true});
           }
         }.bind(panel);
         panel.on(wcDocker.EVENT.CLOSED, onCloseFunc);