IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-16 18:25:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

1. Operators dropdown disabled. Fixes #6771.

Browse Source 
2. Vacuum options value is not considered for M-SQL when creating. Fixes #6781.
This commit is contained in:
Aditya Toshniwal 2021-10-05 14:13:15 +05:30 committed by Akshay Joshi
parent d4280c896d
commit 400896c563
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
View File

@ -169,7 +169,9 @@ class ExclusionColumnSchema extends BaseUISchema {
},{ },{
id: 'operator', label: gettext('Operator'), type: 'select', id: 'operator', label: gettext('Operator'), type: 'select',
width: 95, width: 95,
editable: obj.isEditable, editable: function() {
return obj.isNewExCons;
},
cell: (state)=>{ cell: (state)=>{
return { return {
cell: 'select', cell: 'select',

7
web/pgadmin/static/js/SchemaView/index.jsx
View File

@ -114,7 +114,7 @@ const diffArrayOptions = {
compareFunction: objectComparator, compareFunction: objectComparator,
}; };
function getChangedData(topSchema, viewHelperProps, sessData, stringify=false) { function getChangedData(topSchema, viewHelperProps, sessData, stringify=false, includeSkipChange=true) {
let changedData = {}; let changedData = {};
let isEdit = viewHelperProps.mode === 'edit'; let isEdit = viewHelperProps.mode === 'edit';
@ -147,8 +147,9 @@ function getChangedData(topSchema, viewHelperProps, sessData, stringify=false) {
let {modeSupported} = getFieldMetaData(field, schema, {}, viewHelperProps, true); let {modeSupported} = getFieldMetaData(field, schema, {}, viewHelperProps, true);
/* If skipChange is true, then field will not be considered for changed data, /* If skipChange is true, then field will not be considered for changed data,
This is helpful when Save or Reset should not be enabled on this field change alone.
No change in other behaviour */ No change in other behaviour */
if(!modeSupported || field.skipChange) { if(!modeSupported || (field.skipChange && !includeSkipChange)) {
return; return;
} }
if(typeof(field.type) == 'string' && field.type.startsWith('nested-')) { if(typeof(field.type) == 'string' && field.type.startsWith('nested-')) {
@ -477,7 +478,7 @@ function SchemaDialogView({
if(!isNotValid) setFormErr({}); if(!isNotValid) setFormErr({});
/* check if anything changed */ /* check if anything changed */
let changedData = getChangedData(schema, viewHelperProps, sessData); let changedData = getChangedData(schema, viewHelperProps, sessData, false, false);
let isDataChanged = Object.keys(changedData).length > 0; let isDataChanged = Object.keys(changedData).length > 0;
setDirty(isDataChanged); setDirty(isDataChanged);