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

Fixed 'Rename local variable to match the regular expression' issue reported by SonarQube.

Browse Source
This commit is contained in:
Nikhil Mohite 2020-06-24 16:08:14 +05:30 committed by Akshay Joshi
parent 15c621b1d8
commit db9d684524
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@ -278,11 +278,11 @@ class DatabaseView(PGChildNodeView):
dbname = row['name']
if self.manager.db == dbname:
connected = True
canDrop = canDisConn = False
can_drop = can_dis_conn = False
else:
conn = self.manager.connection(dbname, did=row['did'])
connected = conn.connected()
canDrop = canDisConn = True
can_drop = can_dis_conn = True
res.append(
self.blueprint.generate_browser_node(
@ -295,8 +295,8 @@ class DatabaseView(PGChildNodeView):
tablespace=row['spcname'],
allowConn=row['datallowconn'],
canCreate=row['cancreate'],
canDisconn=canDisConn,
canDrop=canDrop,
canDisconn=can_dis_conn,
canDrop=can_drop,
inode=True if row['datallowconn'] else False
)
)
@ -733,9 +733,9 @@ class DatabaseView(PGChildNodeView):
res = rset['rows'][0]
canDrop = canDisConn = True
can_drop = can_dis_conn = True
if self.manager.db == res['name']:
canDrop = canDisConn = False
can_drop = can_dis_conn = False
return jsonify(
node=self.blueprint.generate_browser_node(
@ -750,8 +750,8 @@ class DatabaseView(PGChildNodeView):
tablespace=res['spcname'],
allowConn=res['datallowconn'],
canCreate=res['cancreate'],
canDisconn=canDisConn,
canDrop=canDrop,
canDisconn=can_dis_conn,
canDrop=can_drop,
inode=True if res['datallowconn'] else False
)
)
@ -883,7 +883,6 @@ class DatabaseView(PGChildNodeView):
return _(" -- definition incomplete")
acls = []
SQL_acl = ''
try:
acls = render_template(
@ -901,7 +900,7 @@ class DatabaseView(PGChildNodeView):
data[aclcol], allowedacl['acl']
)
SQL_acl = render_template(
sql_acl = render_template(
"/".join([self.template_path, 'grant.sql']),
data=data,
conn=self.conn
@ -912,7 +911,7 @@ class DatabaseView(PGChildNodeView):
data=data, conn=self.conn
)
SQL += "\n"
SQL += SQL_acl
SQL += sql_acl
return SQL
def get_online_sql(self, gid, sid, data, did=None):