diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/functions/privilege.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/functions/privilege.macros index 075e76847..08d11980f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/functions/privilege.macros +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/functions/privilege.macros @@ -1,12 +1,12 @@ {##############################################} {# Macros for Privileges (functions module) #} {##############################################} -{% macro SET(conn, type, role, param, priv, with_grant, schema, func_args) -%} -{% if priv %} -GRANT {{ priv }} ON {{ type }} {{ conn|qtIdent(schema, param) }}({{func_args}}) TO {{ conn|qtIdent(role) }}; +{% macro SET(conn, type, role, param, privs, with_grant_privs, schema, func_args) -%} +{% if privs %} +GRANT {{ privs|join(', ') }} ON {{ type }} {{ conn|qtIdent(schema, param) }}({{func_args}}) TO {{conn|qtIdent(role) }}; {% endif %} -{% if with_grant %} -GRANT {{ with_grant }} ON {{ type }} {{ conn|qtIdent(schema, param) }}({{func_args}}) TO {{ conn|qtIdent(role) }} WITH GRANT OPTION; +{% if with_grant_privs %} +GRANT {{ with_grant_privs|join(', ') }} ON {{ type }} {{ conn|qtIdent(schema, param) }}({{func_args}}) TO {{ conn|qtIdent(role) }} WITH GRANT OPTION; {% endif %} {%- endmacro %} {% macro UNSETALL(conn, type, role, param, schema, func_args) -%} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/schemas/privilege.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/schemas/privilege.macros index cec2e5338..183ec2f1e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/schemas/privilege.macros +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/macros/schemas/privilege.macros @@ -1,12 +1,12 @@ {##########################################} {# Macros for schema and its child nodes #} {##########################################} -{% macro SET(conn, type, role, param, priv, with_grant, schema) -%} -{% if priv %} -GRANT {{ priv }} ON {{ type }} {{ conn|qtIdent(schema, param) }} TO {{ conn|qtIdent(role) }}; +{% macro SET(conn, type, role, param, privs, with_grant_privs, schema) -%} +{% if privs %} +GRANT {{ privs|join(', ') }} ON {{ type }} {{ conn|qtIdent(schema, param) }} TO {{ conn|qtIdent(role) }}; {% endif %} -{% if with_grant %} -GRANT {{ with_grant }} ON {{ type }} {{ conn|qtIdent(schema, param) }} TO {{ conn|qtIdent(role) }} WITH GRANT OPTION; +{% if with_grant_privs %} +GRANT {{ with_grant_privs|join(', ') }} ON {{ type }} {{ conn|qtIdent(schema, param) }} TO {{ conn|qtIdent(role) }} WITH GRANT OPTION; {% endif %} {%- endmacro %} {% macro UNSETALL(conn, type, role, param, schema) -%}