mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Update ACL parsing for tablespaces to use newer infrastructure.
This commit is contained in:
parent
5347bdb886
commit
b747a5b5eb
@ -122,6 +122,8 @@ class TablespaceView(PGChildNodeView):
|
|||||||
current_app.logger.debug(
|
current_app.logger.debug(
|
||||||
"Using the template path: %s", self.template_path
|
"Using the template path: %s", self.template_path
|
||||||
)
|
)
|
||||||
|
# Allowed ACL on tablespace
|
||||||
|
self.acls = ['C']
|
||||||
|
|
||||||
return f(*args, **kwargs)
|
return f(*args, **kwargs)
|
||||||
return wrap
|
return wrap
|
||||||
@ -439,11 +441,11 @@ class TablespaceView(PGChildNodeView):
|
|||||||
for key in ['spcacl']:
|
for key in ['spcacl']:
|
||||||
if key in data and data[key] is not None:
|
if key in data and data[key] is not None:
|
||||||
if 'added' in data[key]:
|
if 'added' in data[key]:
|
||||||
data[key]['added'] = parse_priv_to_db(data[key]['added'], 'TABLESPACE')
|
data[key]['added'] = parse_priv_to_db(data[key]['added'], self.acl)
|
||||||
if 'changed' in data[key]:
|
if 'changed' in data[key]:
|
||||||
data[key]['changed'] = parse_priv_to_db(data[key]['changed'], 'TABLESPACE')
|
data[key]['changed'] = parse_priv_to_db(data[key]['changed'], self.acl)
|
||||||
if 'deleted' in data[key]:
|
if 'deleted' in data[key]:
|
||||||
data[key]['deleted'] = parse_priv_to_db(data[key]['deleted'], 'TABLESPACE')
|
data[key]['deleted'] = parse_priv_to_db(data[key]['deleted'], self.acl)
|
||||||
|
|
||||||
# If name is not present with in update data then copy it
|
# If name is not present with in update data then copy it
|
||||||
# from old data
|
# from old data
|
||||||
@ -458,7 +460,7 @@ class TablespaceView(PGChildNodeView):
|
|||||||
else:
|
else:
|
||||||
# To format privileges coming from client
|
# To format privileges coming from client
|
||||||
if 'spcacl' in data:
|
if 'spcacl' in data:
|
||||||
data['spcacl'] = parse_priv_to_db(data['spcacl'], 'TABLESPACE')
|
data['spcacl'] = parse_priv_to_db(data['spcacl'], self.acl)
|
||||||
# If the request for new object which do not have tsid
|
# If the request for new object which do not have tsid
|
||||||
SQL = render_template(
|
SQL = render_template(
|
||||||
"/".join([self.template_path, 'create.sql']),
|
"/".join([self.template_path, 'create.sql']),
|
||||||
@ -492,7 +494,7 @@ class TablespaceView(PGChildNodeView):
|
|||||||
|
|
||||||
# To format privileges
|
# To format privileges
|
||||||
if 'spcacl' in old_data:
|
if 'spcacl' in old_data:
|
||||||
old_data['spcacl'] = parse_priv_to_db(old_data['spcacl'], 'TABLESPACE')
|
old_data['spcacl'] = parse_priv_to_db(old_data['spcacl'], self.acl)
|
||||||
|
|
||||||
SQL = ''
|
SQL = ''
|
||||||
# We are not showing create sql for system tablespace
|
# We are not showing create sql for system tablespace
|
||||||
|
Loading…
Reference in New Issue
Block a user