From 97f3a271c58cb6b76d993e10b43c863459310407 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 30 Apr 2015 19:36:15 +0000
Subject: [PATCH] RM-2115 (View Security Clearance UI)

+review RM-44

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rma/classification/usersecurityclearance.lib.ftl   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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</#if>,
       "firstName": <#if pi.firstName??>"${pi.firstName}"<#else>null</#if>,
-      "lastName": <#if pi.lastName??>"${pi.lastName}"<#else>null</#if>
+      "lastName": <#if pi.lastName??>"${pi.lastName}"<#else>null</#if>,
+      "fullName": <#if pi.firstName?? && pi.lastName??>"${pi.firstName} ${pi.lastName}"<#else>"${pi.userName}"</#if>,
+      "completeName": <#if pi.firstName?? && pi.lastName?? && pi.userName??>"${pi.firstName} ${pi.lastName} (${pi.userName})"<#else>"${pi.userName}"</#if>
    </#escape>
 </#macro>
\ No newline at end of file