diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css index acd1d98..128d30a 100644 --- a/web/pgadmin/browser/static/css/wizard.css +++ b/web/pgadmin/browser/static/css/wizard.css @@ -106,6 +106,12 @@ margin-right: 0 !important; } +.wizard-header .wizard-cancel-event { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAdklEQVQ4jd2SwQnAIAxF36GH0pOTFHEgF3IkR5LO0F4SCGJVEHroAy/f/E+igV+yAa6hO7nrcgAZuIBg9CBalppXEnDL0RA1q556ASdQqhBrLlLTxVch1uxHZiU2AuKs2Vdt23GGHSy/wfIvzOzBPhpjaRO/5wG/szevJ+ZXzAAAAABJRU5ErkJggg==) no-repeat center center; + padding: 10px; + margin-top: -1px; +} + /* Wizard Status bar CSS */ .pgadmin-wizard .wizard-description { padding: 1.0em 0.1em; @@ -131,4 +137,4 @@ */ .select2-container--open { z-index: 10000; -} \ No newline at end of file +} diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js index 383a312..d914ef9 100644 --- a/web/pgadmin/browser/static/js/wizard.js +++ b/web/pgadmin/browser/static/js/wizard.js @@ -42,6 +42,7 @@ function(_, Backbone, pgAdmin, pgBrowser) { disable_prev: false, disable_finish: false, disable_cancel: false, + show_header_cancel_btn: false, /* show cancel button at wizard header */ height: 400, width: 650, show_left_panel: true @@ -55,16 +56,21 @@ function(_, Backbone, pgAdmin, pgBrowser) { + "

<%= this.options.title %> -" + " <%= page_title %>

" + " " + + " <% if (this.options.show_header_cancel_btn) { %>" + + "
" + + " " + + "
" + + " <% } %>" + " " + " " + "
" - + " <% if(this.options.show_left_panel) { %>" + + " <% if (this.options.show_left_panel) { %>" + "
" + "
" + " <% } %>" - + "
9<% }" + " else { %>12<% } %> wizard-right-panel'>" - + " <% if( typeof show_description != 'undefined'){ %>" + + " <% if ( typeof show_description != 'undefined'){ %>" + "
" + " <%= show_description %>" + "
" @@ -79,7 +85,7 @@ function(_, Backbone, pgAdmin, pgBrowser) { + "
" + "
" + "
" - + "

<% if(show_progress_bar){ %><%= show_progress_bar %><% } %>

" + + "

<% if (show_progress_bar) { %><%= show_progress_bar %><% } %>

" + "
" + "
" + "
" @@ -100,6 +106,7 @@ function(_, Backbone, pgAdmin, pgBrowser) { "click button.wizard-next" : "nextPage", "click button.wizard-back" : "prevPage", "click button.wizard-cancel" : "onCancel", + "click button.wizard-cancel-event" : "onCancel", "click button.wizard-finish" : "finishWizard", }, initialize: function(options) { diff --git a/web/pgadmin/tools/grant_wizard/__init__.py b/web/pgadmin/tools/grant_wizard/__init__.py index a60dc36..ca8ee40 100644 --- a/web/pgadmin/tools/grant_wizard/__init__.py +++ b/web/pgadmin/tools/grant_wizard/__init__.py @@ -281,7 +281,19 @@ def properties(gid, sid, did, node_id, node_type): if ntype in ['schema', 'view']: SQL = render_template("/".join( [server_prop['template_path'], '/sql/view.sql']), - node_id=node_id, nspname=nspname) + node_id=node_id, node_type='v', nspname=nspname) + + status, res = conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + res_data.extend(res['rows']) + + # Fetch Materialzed Views against schema + if ntype in ['schema', 'mview']: + SQL = render_template("/".join( + [server_prop['template_path'], '/sql/view.sql']), + node_id=node_id, node_type='m', nspname=nspname) status, res = conn.execute_dict(SQL) if not status: diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js index ea0f0de..1050c46 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js @@ -206,6 +206,7 @@ define([ resizable: true, autoReset: false, maximizable: false, + closable: false, closableByDimmer: false } }; @@ -219,7 +220,7 @@ define([ // Add pgadmin_grant_wizard_body class to dialog $(this.elements.body).addClass('pgadmin_grant_wizard_body'); - }, + } }, /** @@ -521,6 +522,11 @@ define([ case 'View': object_type = 'table'; break; + case 'Materialized View': + object_type = 'table'; + break; + default: + break; } /** @@ -1041,6 +1047,7 @@ define([ height: '', curr_page: 0, show_left_panel: false, + show_header_cancel_btn: true, disable_finish: true }, diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json index 78782b5..2502342 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json @@ -15,10 +15,6 @@ "type": "TABLE", "acl": ["a", "w", "d", "D", "x", "t"] }, - "view": { - "type": "VIEW", - "acl": ["a", "w", "d", "D", "x", "t"] - }, "sequence": { "type": "SEQUENCE", "acl": ["w", "U"] diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql index c74b86e..f3a31c7 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql @@ -2,7 +2,7 @@ {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} {% for obj in data.objects -%} {% for priv in data.priv -%} -{% if obj.object_type == 'Table' or obj.object_type == 'View' %} +{% if obj.object_type == 'Table' or obj.object_type == 'View' or obj.object_type == 'Materialized View'%} {{ PRIVILEGE.SET(conn, 'TABLE', priv['grantee'], obj.name, priv['without_grant'], priv['with_grant'], obj.nspname ) }} {% endif %} {% endfor -%} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql index fab77cc..b16e7a3 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql @@ -1,8 +1,9 @@ {# ===== Fetch list of Database object types(View) ===== #} -{% if node_id %} +{% if node_id and node_type %} +{% set ntype = "View" if node_type == 'v' else "Materialized View" %} SELECT c.relname AS name, - 'View' AS object_type, + '{{ ntype }}' AS object_type, 'icon-view' AS icon, '{{ nspname }}' AS nspname FROM @@ -20,7 +21,7 @@ WHERE ((r.ev_class = c.oid) AND (bpchar(r.ev_type) = '1'::bpchar)) )) - ) OR (c.relkind = 'v'::char) + ) AND (c.relkind = '{{ node_type }}'::char) ) AND c.relnamespace = {{ node_id }}::oid ORDER BY diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json index 78782b5..2502342 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json @@ -15,10 +15,6 @@ "type": "TABLE", "acl": ["a", "w", "d", "D", "x", "t"] }, - "view": { - "type": "VIEW", - "acl": ["a", "w", "d", "D", "x", "t"] - }, "sequence": { "type": "SEQUENCE", "acl": ["w", "U"] diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql index c74b86e..f3a31c7 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql @@ -2,7 +2,7 @@ {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} {% for obj in data.objects -%} {% for priv in data.priv -%} -{% if obj.object_type == 'Table' or obj.object_type == 'View' %} +{% if obj.object_type == 'Table' or obj.object_type == 'View' or obj.object_type == 'Materialized View'%} {{ PRIVILEGE.SET(conn, 'TABLE', priv['grantee'], obj.name, priv['without_grant'], priv['with_grant'], obj.nspname ) }} {% endif %} {% endfor -%} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql index fab77cc..279e6ee 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql @@ -1,9 +1,11 @@ {# ===== Fetch list of Database object types(View) ===== #} -{% if node_id %} +{% if node_id and node_type %} +{% set ntype = "View" if node_type == 'v' else "Materialized View" %} +{% set view_icon = "icon-view" if node_type == 'v' else "icon-mview" %} SELECT c.relname AS name, - 'View' AS object_type, - 'icon-view' AS icon, + '{{ ntype }}' AS object_type, + '{{ view_icon }}' AS icon, '{{ nspname }}' AS nspname FROM pg_class c @@ -20,7 +22,7 @@ WHERE ((r.ev_class = c.oid) AND (bpchar(r.ev_type) = '1'::bpchar)) )) - ) OR (c.relkind = 'v'::char) + ) AND (c.relkind = '{{ node_type }}'::char) ) AND c.relnamespace = {{ node_id }}::oid ORDER BY