Hi,

PFA patch for tokes control in fts configuration and  variable control.

Issue fixed : Destroy header controls properly.



-- 
*Harshal Dhumal*
*Software Engineer*

EnterpriseDB India: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
index 690968c..e379b0b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
@@ -386,6 +386,10 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
       this.listenTo(this.headerData, "select2", this.headerDataChanged);
       this.listenTo(this.collection, "remove", this.onAddorRemoveTokens);
 
+      // Remove header controls.
+      _.each(this.controls, function(control) {
+        control.remove();
+      });
       TokenControl.__super__.remove.apply(this, arguments);
 
       // Remove the header model
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
index 13eedd9..2d13728 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
@@ -570,6 +570,11 @@
       this.listenTo(this.headerData, "select2", this.headerDataChanged);
       this.listenTo(this.collection, "remove", this.onRemoveVariable);
 
+      // Remove header controls.
+      _.each(this.controls, function(control) {
+        control.remove();
+      });
+
       VariableCollectionControl.__super__.remove.apply(this, arguments);
 
       // Remove the header model
-- 
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers

Reply via email to