diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/usersecurityclearance.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/usersecurityclearance.lib.ftl index 3380af3bb1..3c643d618d 100644 --- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/usersecurityclearance.lib.ftl +++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/usersecurityclearance.lib.ftl @@ -1,11 +1,13 @@ <#macro usersecurityclearanceJSON item> -<#local cl=item.classificationLevel> -<#local pi=item.personInfo> + <#local cl=item.classificationLevel> + <#local pi=item.personInfo> <#escape x as jsonUtils.encodeJSONString(x)> "classificationId": "${cl.id}", "classificationLabel": "${cl.displayLabel}", - "userName": "${pi.userName}", + "userName": <#if pi.userName??>"${pi.userName}"<#else>null, "firstName": <#if pi.firstName??>"${pi.firstName}"<#else>null, - "lastName": <#if pi.lastName??>"${pi.lastName}"<#else>null + "lastName": <#if pi.lastName??>"${pi.lastName}"<#else>null, + "fullName": <#if pi.firstName?? && pi.lastName??>"${pi.firstName} ${pi.lastName}"<#else>"${pi.userName}", + "completeName": <#if pi.firstName?? && pi.lastName?? && pi.userName??>"${pi.firstName} ${pi.lastName} (${pi.userName})"<#else>"${pi.userName}" \ No newline at end of file