public inbox for [email protected]help / color / mirror / Atom feed
[pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not 4+ messages / 2 participants [nested] [flat]
* [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not @ 2017-05-29 09:31 Murtuza Zabuawala <[email protected]> 2017-05-30 15:43 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Dave Page <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Murtuza Zabuawala @ 2017-05-29 09:31 UTC (permalink / raw) To: pgadmin-hackers Hi, PFA attach patch to add property into trigger node to display if trigger is enabled or disabled in Properties panel and also in dialog. RM#2386 Also used node-list-by-name control instead of muti-select control for listing table columns to simplify the logic. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql index ecb0070..611a593 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql @@ -11,7 +11,7 @@ CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn| {% endif %}{% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql index 86a7ba1..9b023ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql @@ -14,9 +14,9 @@ CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% else %} {% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {%endif %} {% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %}{% else %} {% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index be0404f..d3f51af 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -466,7 +466,7 @@ class TriggerView(PGChildNodeView): columns = [] for row in rset['rows']: - columns.append({'column': row['name']}) + columns.append(row['name']) return columns @@ -572,7 +572,7 @@ class TriggerView(PGChildNodeView): # and convert it to string data['tgargs'] = self._format_args(data['custom_tgargs']) - if len(data['tgattr']) > 1: + if len(data['tgattr']) >= 1: columns = ', '.join(data['tgattr'].split(' ')) data['columns'] = self._column_details(tid, columns) @@ -790,8 +790,8 @@ class TriggerView(PGChildNodeView): try: sql, name = self.get_sql(scid, tid, trid, data) - if not isinstance(SQL, (str, unicode)): - return SQL + if not isinstance(sql, (str, unicode)): + return sql sql = sql.strip('\n').strip(' ') if sql == '': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js index 3f44e7e..370bbbc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js @@ -194,8 +194,8 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { id: 'oid', label:'{{ _('OID') }}', cell: 'string', type: 'int', disabled: true, mode: ['properties'] },{ - id: 'is_enable_trigger', label:'{{ _('Enable trigger?') }}', - type: 'switch', disabled: 'inSchema', mode: ['properties'], + id: 'is_enable_trigger', label:'{{ _('Trigger enabled?') }}', + type: 'switch', disabled: true, mode: ['edit', 'properties'], group: '{{ _('Definition') }}' },{ id: 'is_row_trigger', label:'{{ _('Row trigger?') }}', @@ -419,11 +419,9 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { control: 'sql-field', visible: true, group: '{{ _('Events') }}' },{ id: 'columns', label: '{{ _('Columns') }}', url: 'nodes', - type: 'collection', control: 'multi-select-ajax', + control: 'node-list-by-name', cache_node: 'column', type: 'array', + select2: {'multiple': true}, deps: ['evnt_update'], node: 'column', group: '{{ _('Events') }}', - model: pgBrowser.Node.Model.extend({ - keys: ['column'], defaults: { column: undefined } - }), disabled: function(m) { if(this.node_info && 'catalog' in this.node_info) { return true; -- Sent via pgadmin-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers Attachments: [text/plain] RM_2386.diff (6.0K, 3-RM_2386.diff) download | inline diff: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql index ecb0070..611a593 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql @@ -11,7 +11,7 @@ CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn| {% endif %}{% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql index 86a7ba1..9b023ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql @@ -14,9 +14,9 @@ CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% else %} {% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {%endif %} {% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %}{% else %} {% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index be0404f..d3f51af 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -466,7 +466,7 @@ class TriggerView(PGChildNodeView): columns = [] for row in rset['rows']: - columns.append({'column': row['name']}) + columns.append(row['name']) return columns @@ -572,7 +572,7 @@ class TriggerView(PGChildNodeView): # and convert it to string data['tgargs'] = self._format_args(data['custom_tgargs']) - if len(data['tgattr']) > 1: + if len(data['tgattr']) >= 1: columns = ', '.join(data['tgattr'].split(' ')) data['columns'] = self._column_details(tid, columns) @@ -790,8 +790,8 @@ class TriggerView(PGChildNodeView): try: sql, name = self.get_sql(scid, tid, trid, data) - if not isinstance(SQL, (str, unicode)): - return SQL + if not isinstance(sql, (str, unicode)): + return sql sql = sql.strip('\n').strip(' ') if sql == '': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js index 3f44e7e..370bbbc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js @@ -194,8 +194,8 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { id: 'oid', label:'{{ _('OID') }}', cell: 'string', type: 'int', disabled: true, mode: ['properties'] },{ - id: 'is_enable_trigger', label:'{{ _('Enable trigger?') }}', - type: 'switch', disabled: 'inSchema', mode: ['properties'], + id: 'is_enable_trigger', label:'{{ _('Trigger enabled?') }}', + type: 'switch', disabled: true, mode: ['edit', 'properties'], group: '{{ _('Definition') }}' },{ id: 'is_row_trigger', label:'{{ _('Row trigger?') }}', @@ -419,11 +419,9 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { control: 'sql-field', visible: true, group: '{{ _('Events') }}' },{ id: 'columns', label: '{{ _('Columns') }}', url: 'nodes', - type: 'collection', control: 'multi-select-ajax', + control: 'node-list-by-name', cache_node: 'column', type: 'array', + select2: {'multiple': true}, deps: ['evnt_update'], node: 'column', group: '{{ _('Events') }}', - model: pgBrowser.Node.Model.extend({ - keys: ['column'], defaults: { column: undefined } - }), disabled: function(m) { if(this.node_info && 'catalog' in this.node_info) { return true; ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not 2017-05-29 09:31 [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> @ 2017-05-30 15:43 ` Dave Page <[email protected]> 2017-05-30 16:20 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Dave Page @ 2017-05-30 15:43 UTC (permalink / raw) To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers On Mon, May 29, 2017 at 10:31 AM, Murtuza Zabuawala <[email protected]> wrote: > Hi, > > PFA attach patch to add property into trigger node to display if trigger is > enabled or disabled in Properties panel and also in dialog. > RM#2386 The switch is added, but I cannot toggle it from the dialogue. Can you fix that please? > Also used node-list-by-name control instead of muti-select control for > listing table columns to simplify the logic. OK. Thanks! -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgadmin-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not 2017-05-29 09:31 [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> 2017-05-30 15:43 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Dave Page <[email protected]> @ 2017-05-30 16:20 ` Murtuza Zabuawala <[email protected]> 2017-06-05 16:11 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Dave Page <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Murtuza Zabuawala @ 2017-05-30 16:20 UTC (permalink / raw) To: Dave Page <[email protected]>; +Cc: pgadmin-hackers Hi, PFA updated patch for the same. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Tue, May 30, 2017 at 9:13 PM, Dave Page <[email protected]> wrote: > On Mon, May 29, 2017 at 10:31 AM, Murtuza Zabuawala > <[email protected]> wrote: > > Hi, > > > > PFA attach patch to add property into trigger node to display if trigger > is > > enabled or disabled in Properties panel and also in dialog. > > RM#2386 > > The switch is added, but I cannot toggle it from the dialogue. Can you > fix that please? > > > Also used node-list-by-name control instead of muti-select control for > > listing table columns to simplify the logic. > > OK. > > Thanks! > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql index ecb0070..611a593 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql @@ -11,7 +11,7 @@ CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn| {% endif %}{% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql index 86a7ba1..e400cd6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql @@ -14,9 +14,9 @@ CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% else %} {% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {%endif %} {% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %}{% else %} {% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} @@ -44,3 +44,7 @@ COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspna COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} IS {{data.description|qtLiteral}}; {% endif %} +{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} +ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} + {% if data.is_enable_trigger == True %}ENABLE{% else %}DISABLE{% endif %} TRIGGER {{ conn|qtIdent(data.name) }}; +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index be0404f..a3a26d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -466,7 +466,7 @@ class TriggerView(PGChildNodeView): columns = [] for row in rset['rows']: - columns.append({'column': row['name']}) + columns.append(row['name']) return columns @@ -572,7 +572,7 @@ class TriggerView(PGChildNodeView): # and convert it to string data['tgargs'] = self._format_args(data['custom_tgargs']) - if len(data['tgattr']) > 1: + if len(data['tgattr']) >= 1: columns = ', '.join(data['tgattr'].split(' ')) data['columns'] = self._column_details(tid, columns) @@ -751,14 +751,32 @@ class TriggerView(PGChildNodeView): status, new_trid = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=new_trid) + # Fetch updated properties + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + tid=tid, trid=new_trid, + datlastsysoid=self.datlastsysoid) + + status, res = self.conn.execute_dict(SQL) + + if not status: + return internal_server_error(errormsg=res) + + if len(res['rows']) == 0: + return gone( + gettext("""Could not find the trigger in the table.""")) + + # Making copy of output for future use + data = dict(res['rows'][0]) return jsonify( node=self.blueprint.generate_browser_node( new_trid, tid, name, - icon="icon-%s" % self.node_type if self.is_trigger_enabled - else "icon-%s-bad" % self.node_type + icon="icon-%s" % self.node_type if + data['is_enable_trigger'] else + "icon-%s-bad" % self.node_type ) ) except Exception as e: @@ -790,8 +808,8 @@ class TriggerView(PGChildNodeView): try: sql, name = self.get_sql(scid, tid, trid, data) - if not isinstance(SQL, (str, unicode)): - return SQL + if not isinstance(sql, (str, unicode)): + return sql sql = sql.strip('\n').strip(' ') if sql == '': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js index 3f44e7e..852b4f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js @@ -194,8 +194,8 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { id: 'oid', label:'{{ _('OID') }}', cell: 'string', type: 'int', disabled: true, mode: ['properties'] },{ - id: 'is_enable_trigger', label:'{{ _('Enable trigger?') }}', - type: 'switch', disabled: 'inSchema', mode: ['properties'], + id: 'is_enable_trigger', label:'{{ _('Trigger enabled?') }}', + type: 'switch', disabled: 'inSchema', mode: ['edit', 'properties'], group: '{{ _('Definition') }}' },{ id: 'is_row_trigger', label:'{{ _('Row trigger?') }}', @@ -419,11 +419,9 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { control: 'sql-field', visible: true, group: '{{ _('Events') }}' },{ id: 'columns', label: '{{ _('Columns') }}', url: 'nodes', - type: 'collection', control: 'multi-select-ajax', + control: 'node-list-by-name', cache_node: 'column', type: 'array', + select2: {'multiple': true}, deps: ['evnt_update'], node: 'column', group: '{{ _('Events') }}', - model: pgBrowser.Node.Model.extend({ - keys: ['column'], defaults: { column: undefined } - }), disabled: function(m) { if(this.node_info && 'catalog' in this.node_info) { return true; -- Sent via pgadmin-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers Attachments: [text/plain] RM_2386_v2.diff (8.0K, 3-RM_2386_v2.diff) download | inline diff: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql index ecb0070..611a593 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql @@ -11,7 +11,7 @@ CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn| {% endif %}{% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql index 86a7ba1..e400cd6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql @@ -14,9 +14,9 @@ CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {% endif %}{% else %} {% if data.evnt_truncate %} {% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} {%endif %} {% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} {% endif %}{% else %} {% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c.column) }}{% endfor %}{% endif %}{% endif %} +{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} {% endif %} ON {{ conn|qtIdent(data.schema, data.table) }} @@ -44,3 +44,7 @@ COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspna COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} IS {{data.description|qtLiteral}}; {% endif %} +{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} +ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} + {% if data.is_enable_trigger == True %}ENABLE{% else %}DISABLE{% endif %} TRIGGER {{ conn|qtIdent(data.name) }}; +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index be0404f..a3a26d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -466,7 +466,7 @@ class TriggerView(PGChildNodeView): columns = [] for row in rset['rows']: - columns.append({'column': row['name']}) + columns.append(row['name']) return columns @@ -572,7 +572,7 @@ class TriggerView(PGChildNodeView): # and convert it to string data['tgargs'] = self._format_args(data['custom_tgargs']) - if len(data['tgattr']) > 1: + if len(data['tgattr']) >= 1: columns = ', '.join(data['tgattr'].split(' ')) data['columns'] = self._column_details(tid, columns) @@ -751,14 +751,32 @@ class TriggerView(PGChildNodeView): status, new_trid = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=new_trid) + # Fetch updated properties + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + tid=tid, trid=new_trid, + datlastsysoid=self.datlastsysoid) + + status, res = self.conn.execute_dict(SQL) + + if not status: + return internal_server_error(errormsg=res) + + if len(res['rows']) == 0: + return gone( + gettext("""Could not find the trigger in the table.""")) + + # Making copy of output for future use + data = dict(res['rows'][0]) return jsonify( node=self.blueprint.generate_browser_node( new_trid, tid, name, - icon="icon-%s" % self.node_type if self.is_trigger_enabled - else "icon-%s-bad" % self.node_type + icon="icon-%s" % self.node_type if + data['is_enable_trigger'] else + "icon-%s-bad" % self.node_type ) ) except Exception as e: @@ -790,8 +808,8 @@ class TriggerView(PGChildNodeView): try: sql, name = self.get_sql(scid, tid, trid, data) - if not isinstance(SQL, (str, unicode)): - return SQL + if not isinstance(sql, (str, unicode)): + return sql sql = sql.strip('\n').strip(' ') if sql == '': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js index 3f44e7e..852b4f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js @@ -194,8 +194,8 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { id: 'oid', label:'{{ _('OID') }}', cell: 'string', type: 'int', disabled: true, mode: ['properties'] },{ - id: 'is_enable_trigger', label:'{{ _('Enable trigger?') }}', - type: 'switch', disabled: 'inSchema', mode: ['properties'], + id: 'is_enable_trigger', label:'{{ _('Trigger enabled?') }}', + type: 'switch', disabled: 'inSchema', mode: ['edit', 'properties'], group: '{{ _('Definition') }}' },{ id: 'is_row_trigger', label:'{{ _('Row trigger?') }}', @@ -419,11 +419,9 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) { control: 'sql-field', visible: true, group: '{{ _('Events') }}' },{ id: 'columns', label: '{{ _('Columns') }}', url: 'nodes', - type: 'collection', control: 'multi-select-ajax', + control: 'node-list-by-name', cache_node: 'column', type: 'array', + select2: {'multiple': true}, deps: ['evnt_update'], node: 'column', group: '{{ _('Events') }}', - model: pgBrowser.Node.Model.extend({ - keys: ['column'], defaults: { column: undefined } - }), disabled: function(m) { if(this.node_info && 'catalog' in this.node_info) { return true; ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not 2017-05-29 09:31 [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> 2017-05-30 15:43 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Dave Page <[email protected]> 2017-05-30 16:20 ` Re: [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> @ 2017-06-05 16:11 ` Dave Page <[email protected]> 0 siblings, 0 replies; 4+ messages in thread From: Dave Page @ 2017-06-05 16:11 UTC (permalink / raw) To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers Thanks, applied. On Tue, May 30, 2017 at 5:20 PM, Murtuza Zabuawala <[email protected]> wrote: > Hi, > > PFA updated patch for the same. > > -- > Regards, > Murtuza Zabuawala > EnterpriseDB: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > > On Tue, May 30, 2017 at 9:13 PM, Dave Page <[email protected]> wrote: >> >> On Mon, May 29, 2017 at 10:31 AM, Murtuza Zabuawala >> <[email protected]> wrote: >> > Hi, >> > >> > PFA attach patch to add property into trigger node to display if trigger >> > is >> > enabled or disabled in Properties panel and also in dialog. >> > RM#2386 >> >> The switch is added, but I cannot toggle it from the dialogue. Can you >> fix that please? >> >> > Also used node-list-by-name control instead of muti-select control for >> > listing table columns to simplify the logic. >> >> OK. >> >> Thanks! >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company > > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgadmin-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers ^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2017-06-05 16:11 UTC | newest] Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2017-05-29 09:31 [pgAdmin4][Patch] Add property in trigger node to display if trigger is enabled or not Murtuza Zabuawala <[email protected]> 2017-05-30 15:43 ` Dave Page <[email protected]> 2017-05-30 16:20 ` Murtuza Zabuawala <[email protected]> 2017-06-05 16:11 ` Dave Page <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox