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 console error when changing kind(SQL/BATCH) for pgAgent job step. Fixes #4582

Browse Source
This commit is contained in:
Aditya Toshniwal 2019-08-08 18:43:38 +05:30 committed by Akshay Joshi
parent 350ffcce7c
commit 1281f5cd6c
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en_US/release_notes_4_12.rst
View File

@ -45,4 +45,5 @@ Bug fixes
| `Issue #4559 <https://redmine.postgresql.org/issues/4559>`_ - Ensure triggers should be updated properly for EPAS server.
| `Issue #4565 <https://redmine.postgresql.org/issues/4565>`_ - Fix the reverse engineered SQL for trigger functions with the WINDOW option selected.
| `Issue #4578 <https://redmine.postgresql.org/issues/4578>`_ - Ensure enable trigger menu should be visible when trigger is disabled.
| `Issue #4581 <https://redmine.postgresql.org/issues/4581>`_ - Ensure the comment on a Primary Key constraint can be edited under the Table node.
| `Issue #4581 <https://redmine.postgresql.org/issues/4581>`_ - Ensure the comment on a Primary Key constraint can be edited under the Table node.
| `Issue #4582 <https://redmine.postgresql.org/issues/4582>`_ - Fix console error when changing kind(SQL/BATCH) for pgAgent job step.

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

@ -45,10 +45,10 @@ define('pgadmin.node.pga_jobstep', [
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable) {
this.$el.addClass('editable');
input.bootstrapSwitch('disabled', false);
input.bootstrapToggle('disabled', false);
} else {
this.$el.removeClass('editable');
input.bootstrapSwitch('disabled', true);
input.bootstrapToggle('disabled', true);
// Set self value into model
setTimeout(function () {
model.set(self_name, true);
@ -209,18 +209,8 @@ define('pgadmin.node.pga_jobstep', [
},{
id: 'jstcode', label: '', cell: 'string', deps: ['jstkind'],
type: 'text', group: gettext('Code'),
control: Backform.SqlFieldControl.extend({
render: function() {
if (this.model.get('jstkind')) {
this.field.set('label', gettext('SQL query'));
} else {
this.field.set('label', gettext('Script'));
}
return Backform.SqlFieldControl.prototype.render.apply(
this, arguments
);
},
}),
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
}],
validate: function() {
var val = this.get('jstname'),

4
web/pgadmin/static/scss/_backgrid.overrides.scss
View File

@ -235,6 +235,10 @@ span.form-control:disabled {
padding: 0.5rem;
}
& .tab-content {
padding: 0px;
}
fieldset.inline-fieldset {
background: $color-bg-theme;
}