Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PRESIDECMS-2946 object attribute batch editable default #1538

Open
wants to merge 2 commits into
base: stable
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions system/services/admin/DataManagerService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,13 @@ component {

var fields = [];
var propertyNames = _getPresideObjectService().getObjectAttribute( objectName=objectName, attributeName="propertyNames" );
var batchEditableDefault = _getPresideObjectService().getObjectAttribute( objectName=objectName, attributeName="batchEditableDefault", defaultValue=true );
var props = _getPresideObjectService().getObjectProperties( objectName );
var dao = _getPresideObjectService().getObject( objectName );
var forbiddenFields = [ dao.getIdField(), dao.getLabelField(), dao.getDateCreatedField(), dao.getDateModifiedField(), dao.getFlagField() ];
var isFieldBatchEditable = function( propertyName, attributes ) {
if ( forbiddenFields.findNoCase( propertyName ) ) {
return false
return false;
}
if ( attributes.relationship == "one-to-many" ) {
return false;
Expand All @@ -201,11 +202,11 @@ component {
if ( propertyName.reFind( "^_" ) ) {
return false;
}
if ( IsBoolean( attributes.batcheditable ?: "" ) && !attributes.batcheditable ) {
return false;
if ( IsBoolean( attributes.batcheditable ?: "" ) ) {
return attributes.batcheditable;
}

return true;
return batchEditableDefault;
}

for( var propertyName in propertyNames ) {
Expand Down
Loading