IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-28 17:24:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in cases where the user tries to rename or create a server group that would duplicate an existing group. Fixes #2414

Browse Source
This commit is contained in:
Murtuza Zabuawala 2017-05-17 15:57:38 +01:00 committed by Dave Page
parent 17de7db70b
commit eb18320950
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/pgadmin/browser/server_groups/__init__.py
View File

@ -19,9 +19,9 @@ from flask_security import current_user
from pgadmin.browser import BrowserPluginModule
from pgadmin.browser.utils import NodeView
from pgadmin.utils.ajax import make_json_response, gone, \
make_response as ajax_response
make_response as ajax_response, bad_request
from pgadmin.utils.menu import MenuItem
from sqlalchemy import exc
from pgadmin.model import db, ServerGroup
@ -174,6 +174,10 @@ class ServerGroupView(NodeView):
if u'name' in data:
servergroup.name = data[u'name']
db.session.commit()
except exc.IntegrityError:
return bad_request(gettext(
"The specified server group already exists."
))
except Exception as e:
return make_json_response(
status=410, success=0, errormsg=e.message
@ -220,18 +224,6 @@ class ServerGroupView(NodeView):
)
if data[u'name'] != '':
try:
check_sg = ServerGroup.query.filter_by(
user_id=current_user.id,
name=data[u'name']).first()
# Throw error if server group already exists...
if check_sg is not None:
return make_json_response(
status=409,
success=0,
errormsg=gettext('Server group already exists')
)
sg = ServerGroup(
user_id=current_user.id,
name=data[u'name'])
@ -248,9 +240,15 @@ class ServerGroupView(NodeView):
"icon-%s" % self.node_type,
True,
self.node_type,
can_delete=True # This is user created hence can deleted
# This is user created hence can deleted
can_delete=True
)
)
except exc.IntegrityError:
return bad_request(gettext(
"The specified server group already exists."
))
except Exception as e:
return make_json_response(
status=410,