resolved conflicts
Showing
- entity/PermissionAction_entity/PermissionAction_entity.aod 0 additions, 1 deletionentity/PermissionAction_entity/PermissionAction_entity.aod
- entity/PermissionAction_entity/entityfields/action/displayValueProcess.js 0 additions, 6 deletions...nAction_entity/entityfields/action/displayValueProcess.js
- entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js 8 additions, 5 deletions...ail_entity/entityfields/accesstype/displayValueProcess.js
- entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js 2 additions, 2 deletions...sionDetail_entity/entityfields/accesstype/valueProcess.js
- entity/PermissionDetail_entity/entityfields/permissionactions/children/permissionid_param/valueProcess.js 16 additions, 21 deletions...issionactions/children/permissionid_param/valueProcess.js
- entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js 5 additions, 3 deletions...ail_entity/entityfields/permissionactions/onValidation.js
- entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js 3 additions, 5 deletions...ionDetail_entity/entityfields/role/displayValueProcess.js
- entity/PermissionDetail_entity/entityfields/role/valueProcess.js 2 additions, 1 deletion...PermissionDetail_entity/entityfields/role/valueProcess.js
- entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js 12 additions, 15 deletions...ionDetail_entity/recordcontainers/jdito/contentProcess.js
- entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js 2 additions, 16 deletions...ermissionDetail_entity/recordcontainers/jdito/onDelete.js
- entity/Role_entity/recordcontainers/jdito/contentProcess.js 6 additions, 6 deletionsentity/Role_entity/recordcontainers/jdito/contentProcess.js
- process/Permission_lib/process.js 25 additions, 6 deletionsprocess/Permission_lib/process.js
Loading
Please register or sign in to comment