IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-16 18:25:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a number of issues with domains and domain constraints. Fixes #2529

Browse Source
This commit is contained in:
Khushboo Vashi 2017-07-04 11:52:58 +01:00 committed by Dave Page
parent 0aa763b706
commit 66b101fe4c
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
View File

@ -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):
"""

0
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraint.js → web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
View File

10
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
View File

@ -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);