diff --git a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js index c385f20ddda44bda9cddbaef0915a3f94d6f3d3d..1b7bb9afc5e9dbc903b3883c38ea11112720ef13 100644 --- a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js @@ -9,7 +9,7 @@ var role = ""; if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) { role = vars.get("$param.RoleTitle_param"); } else { - role = PermissionUtil.resolveRoleTitle(vars.get("$this.value")); + role = PermissionUtil.resolveRoleName(vars.get("$this.value")); } result.string(role); \ No newline at end of file diff --git a/neonView/PermissionActionList_view/PermissionActionList_view.aod b/neonView/PermissionActionList_view/PermissionActionList_view.aod index 70b320c5f3e89cb72e06390af4cf9bd4e3fa75fc..5c2b5320fea72c15dfcea1c91809044ce100dbe0 100644 --- a/neonView/PermissionActionList_view/PermissionActionList_view.aod +++ b/neonView/PermissionActionList_view/PermissionActionList_view.aod @@ -8,7 +8,9 @@ <titleField></titleField> <fixedDrawer v="true" /> <entityField>#ENTITY</entityField> + <isDeletable v="false" /> <isEditable v="false" /> + <isCreatable v="false" /> <columns> <neonTableColumn> <name>cc9ac8b7-e98b-4ce6-a0f0-204c05c1a3ce</name> diff --git a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod index 1d20aec23a2ad12191f51aa0986ef4183f994416..5837be977a6821061751901378dc9dcaebe471ae 100644 --- a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod +++ b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod @@ -13,7 +13,7 @@ <iconField>#ICON</iconField> <titleField>#CONTENTTITLE</titleField> <entityField>#ENTITY</entityField> - <isEditable v="true" /> + <isEditable v="false" /> </cardViewTemplate> <genericViewTemplate> <name>Generic</name> diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js index 2a64b0941edda3b3b5bc6ecd2be51a698df2ef7a..4114e63799be2b07241accd943c50e774dcd66e0 100644 --- a/process/Permission_lib/process.js +++ b/process/Permission_lib/process.js @@ -392,12 +392,12 @@ function PermissionUtil () {} PermissionUtil.insertSet = function(pParentPermSetId, pEntity, pRole, pField, pAccessType) { var table = "ASYS_PERMISSIONSET"; var cols = [ - "FIELD_ID", - "ACCESSTYPE", - "ROLE_ID", - "ASYS_PERMISSIONSETID", - "ASYS_PERMISSIONSET_ID", - "ENTITY_ID" + "FIELD_ID", + "ACCESSTYPE", + "ROLE_ID", + "ASYS_PERMISSIONSETID", + "ASYS_PERMISSIONSET_ID", + "ENTITY_ID" ]; var setId = util.getNewUUID(); var vals = [pField, pAccessType, pRole, setId, pParentPermSetId, pEntity]; @@ -421,10 +421,10 @@ function PermissionUtil () {} PermissionUtil.insertPermission = function(pParentSetId, pCond, pCondType, pPermId) { var table = "ASYS_PERMISSION"; var cols = [ - "ASYS_PERMISSIONSET_ID", - "ASYS_PERMISSIONID", - "CONDTYPE", - "COND" + "ASYS_PERMISSIONSET_ID", + "ASYS_PERMISSIONID", + "CONDTYPE", + "COND" ]; var permId; if (pPermId != null && pPermId != "" && pPermId != undefined) { @@ -451,9 +451,9 @@ function PermissionUtil () {} PermissionUtil.insertAction = function(pParentPermId, pAction, pActionId) { var table = "ASYS_PERMISSIONACTION"; var cols = [ - "ASYS_PERMISSIONACTIONID", - "ASYS_PERMISSION_ID", - "ACTION" + "ASYS_PERMISSIONACTIONID", + "ASYS_PERMISSION_ID", + "ACTION" ]; var actionId; var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTIONID = '" + pActionId + "'"; @@ -581,11 +581,11 @@ function PermissionUtil () {} } /** - * Converts a title of a role to the unqiue name of a role. + * Converts the role title to the unqiue role name. * * @param {String} pRoleTitle title of a role, mandatory * - * @result {String} returns name of a role, empty string if no fitting role name exists + * @result {String} returns role name, empty string if no fitting role name exists */ PermissionUtil.resolveRoleTitle = function(pRoleTitle) { var allRoles = tools.getAllRoles(); @@ -598,6 +598,24 @@ function PermissionUtil () {} return roleName; } + /** + * Converts the unqiue role name to the role title. + * + * @param {String} pRoleName name of a role, mandatory + * + * @result {String} returns title of a role, empty string if no fitting role title exists + */ + PermissionUtil.resolveRoleName = function(pRoleName) { + var allRoles = tools.getAllRoles(); + var roleTitle = ""; + for each (role in allRoles) { + if (role[3] == pRoleName) { + roleTitle = role[0]; + } + } + return roleTitle; + } + } //end of block