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

Fix alignment of Connection type toggle switch of pgagent. Fixes #3974

Browse Source
This commit is contained in:
Akshay Joshi
2019-02-13 13:03:44 +05:30
parent f72dcc23ea
commit 0aa93ac3ba
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_3.rst
View File

@@ -18,5 +18,6 @@ Bug fixes
| `Bug #3873 <https://redmine.postgresql.org/issues/3873>`_ - Fix context sub-menu alignment on Safari. | `Bug #3873 <https://redmine.postgresql.org/issues/3873>`_ - Fix context sub-menu alignment on Safari.
| `Bug #3942 <https://redmine.postgresql.org/issues/3942>`_ - Close connections gracefully when the user logs out of pgAdmin. | `Bug #3942 <https://redmine.postgresql.org/issues/3942>`_ - Close connections gracefully when the user logs out of pgAdmin.
| `Bug #3963 <https://redmine.postgresql.org/issues/3963>`_ - Fix alignment of import/export toggle switch. | `Bug #3963 <https://redmine.postgresql.org/issues/3963>`_ - Fix alignment of import/export toggle switch.
| `Bug #3974 <https://redmine.postgresql.org/issues/3974>`_ - Fix alignment of Connection type toggle switch of pgagent.
| `Bug #3981 <https://redmine.postgresql.org/issues/3981>`_ - Fix the query to set bytea_output so that read-only standbys don't consider it a write query. | `Bug #3981 <https://redmine.postgresql.org/issues/3981>`_ - Fix the query to set bytea_output so that read-only standbys don't consider it a write query.
| `Bug #3985 <https://redmine.postgresql.org/issues/3985>`_ - Don't embed docs and external sites in iframes, to allow the external sites to set X-FRAME-OPTIONS = DENY for security. | `Bug #3985 <https://redmine.postgresql.org/issues/3985>`_ - Don't embed docs and external sites in iframes, to allow the external sites to set X-FRAME-OPTIONS = DENY for security.

4
web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js
View File

@@ -153,7 +153,7 @@ define('pgadmin.node.pga_jobstep', [
disabled: function(m) { return !m.get('jstkind'); }, disabled: function(m) { return !m.get('jstkind'); },
options: { options: {
'onText': gettext('Local'), 'offText': gettext('Remote'), 'onText': gettext('Local'), 'offText': gettext('Remote'),
'onColor': 'primary', 'offColor': 'primary', 'onColor': 'primary', 'offColor': 'primary', width: '65',
}, },
},{ },{
id: 'jstconntype', label: gettext('Connection type'), id: 'jstconntype', label: gettext('Connection type'),
@@ -166,7 +166,7 @@ define('pgadmin.node.pga_jobstep', [
}, },
options: { options: {
'onText': gettext('Local'), 'offText': gettext('Remote'), 'onText': gettext('Local'), 'offText': gettext('Remote'),
'onColor': 'primary', 'offColor': 'primary', 'onColor': 'primary', 'offColor': 'primary', width: '65',
}, helpMessage: gettext('Select <b>Local</b> if the job step will execute on the local database server, or <b>Remote</b> to specify a remote database server.'), }, helpMessage: gettext('Select <b>Local</b> if the job step will execute on the local database server, or <b>Remote</b> to specify a remote database server.'),
},{ },{
id: 'jstdbname', label: gettext('Database'), type: 'text', id: 'jstdbname', label: gettext('Database'), type: 'text',

1
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@@ -528,6 +528,7 @@ define([
type: 'checkbox', type: 'checkbox',
}).prop('checked', rawValue).prop('disabled', !editable).attr('data-toggle', 'toggle') }).prop('checked', rawValue).prop('disabled', !editable).attr('data-toggle', 'toggle')
.attr('data-size', options.size).attr('data-on', options.onText).attr('data-off', options.offText) .attr('data-size', options.size).attr('data-on', options.onText).attr('data-off', options.offText)
.attr('data-width', options.width).attr('data-height', options.height)
.attr('data-onstyle', options.onColor).attr('data-offstyle', options.offColor)); .attr('data-onstyle', options.onColor).attr('data-offstyle', options.offColor));
this.$input = this.$el.find('input[type=checkbox]').first(); this.$input = this.$el.find('input[type=checkbox]').first();