From 66b101fe4c8a8c8d0d0c8f213033ccec7ae7853d Mon Sep 17 00:00:00 2001
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Tue, 4 Jul 2017 11:52:58 +0100
Subject: [PATCH] Resolve a number of issues with domains and domain
 constraints. Fixes #2529

---
 .../domains/domain_constraints/__init__.py    | 29 ++++++++-----------
 ...in_constraint.js => domain_constraints.js} |  0
 .../schemas/domains/static/js/domain.js       | 10 +------
 3 files changed, 13 insertions(+), 26 deletions(-)
 rename web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/{domain_constraint.js => domain_constraints.js} (100%)

diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
index 85cd1c031..b20cb3808 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
@@ -410,7 +410,7 @@ class DomainConstraintView(PGChildNodeView):
         """
         data = self.request
         try:
-            status, SQL = self.get_sql(gid, sid, data, scid, doid)
+            status, SQL, name = self.get_sql(gid, sid, data, scid, doid)
             if not status:
                 return SQL
 
@@ -517,7 +517,7 @@ class DomainConstraintView(PGChildNodeView):
             coid: Domain Constraint Id
         """
         data = self.request
-        status, SQL = self.get_sql(gid, sid, data, scid, doid, coid)
+        status, SQL, name = self.get_sql(gid, sid, data, scid, doid, coid)
         if not status:
             return SQL
 
@@ -534,18 +534,13 @@ class DomainConstraintView(PGChildNodeView):
                 else:
                     icon = ''
 
-                return make_json_response(
-                    success=1,
-                    info="Domain Constraint updated",
-                    data={
-                        'id': coid,
-                        'doid': doid,
-                        'scid': scid,
-                        'sid': sid,
-                        'gid': gid,
-                        'did': did,
-                        'icon': icon
-                    }
+                return jsonify(
+                    node=self.blueprint.generate_browser_node(
+                        coid,
+                        doid,
+                        name,
+                        icon=icon
+                    )
                 )
             else:
                 return make_json_response(
@@ -629,7 +624,7 @@ class DomainConstraintView(PGChildNodeView):
         """
         data = self.request
 
-        status, SQL = self.get_sql(gid, sid, data, scid, doid, coid)
+        status, SQL, name = self.get_sql(gid, sid, data, scid, doid, coid)
         if status and SQL:
             return make_json_response(
                 data=SQL,
@@ -677,9 +672,9 @@ class DomainConstraintView(PGChildNodeView):
                 SQL = render_template("/".join([self.template_path,
                                                 'create.sql']),
                                       data=data, domain=domain, schema=schema)
-            return True, SQL.strip('\n')
+            return True, SQL.strip('\n'), data['name'] if 'name' in data else old_data['name']
         except Exception as e:
-            return False, internal_server_error(errormsg=str(e))
+            return False, internal_server_error(errormsg=str(e)), None
 
     def _get_domain(self, doid):
         """
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
similarity index 100%
rename from web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraint.js
rename to web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
index 61ebe7bd5..03fcb5dd4 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
@@ -19,15 +19,7 @@ define('pgadmin.node.domain', [
   var ConstraintModel = pgBrowser.Node.Model.extend({
     idAttribute: 'conoid',
     initialize: function(attrs, args) {
-      if (_.size(attrs) === 0) {
-        var userInfo = pgBrowser.serverInfo[
-              args.node_info.server._id
-            ].user,
-            schemaInfo = args.node_info.schema;
-        this.set({
-          'owner': userInfo.name, 'schema': schemaInfo._label
-        }, {silent: true});
-      } else {
+      if (!_.size(attrs) === 0) {
         this.convalidated_default = this.get('convalidated')
       }
       pgBrowser.Node.Model.prototype.initialize.apply(this, arguments);