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

Fixed exclusion constraint issues:

Browse Source 
1. Incorrect error message.
2. Properties panel Column Section data missing
3. Operator class value is missing

Fixes #6771
This commit is contained in:
Aditya Toshniwal
2021-09-23 19:28:35 +05:30
committed by Akshay Joshi
parent a6dce27ffa
commit d28f8bc7ee
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/pgadmin/static/js/SchemaView/FormView.jsx
View File

@@ -110,18 +110,21 @@ export function getFieldMetaData(field, schema, value, viewHelperProps, onlyMode
(_.isUndefined(field.max_version) ? true :
(viewHelperProps.serverInfo.version <= field.max_version))));
let _readonly = viewHelperProps.inCatalog || (viewHelperProps.mode == 'properties');
if(!_readonly) {
_readonly = evalFunc(schema, readonly, value);
retData.readonly = viewHelperProps.inCatalog || (viewHelperProps.mode == 'properties');
if(!retData.readonly) {
retData.readonly = evalFunc(schema, readonly, value);
}
retData.readonly = _readonly;
let _visible = verInLimit;
_visible = _visible && evalFunc(schema, _.isUndefined(visible) ? true : visible, value);
retData.visible = Boolean(_visible);
retData.disabled = Boolean(evalFunc(schema, disabled, value));
retData.editable = evalFunc(schema, _.isUndefined(editable) ? true : editable, value);
retData.editable = !(viewHelperProps.inCatalog || (viewHelperProps.mode == 'properties'));
if(retData.editable) {
retData.editable = evalFunc(schema, _.isUndefined(editable) ? true : editable, value);
}
let {canAdd, canEdit, canDelete, canAddRow } = field;
retData.canAdd = _.isUndefined(canAdd) ? retData.canAdd : evalFunc(schema, canAdd, value);

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

@@ -789,6 +789,7 @@ function SchemaPropertiesView({
setLoaderText('Loading...');
getInitData().then((data)=>{
data = data || {};
schema.initialise(data);
if(!unmounted) {
setOrigData(data || {});
setLoaderText('');
@@ -839,7 +840,7 @@ function SchemaPropertiesView({
schema={field.schema}
accessPath={[field.id]}
formErr={{}}
controlClassName={classes.controlRow}
containerClassName={classes.controlRow}
canAdd={false}
canEdit={false}
canDelete={false}