Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_activity_log.xhtml

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 1e5002bc93ccb6a719316cd55fff83b3322704d7..56289add0dc3d3adbd459080f9c534d3474b7eeb 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -37,7 +37,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
                                        </f:facet>
 
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
                                                <f:param name="userId" value="#{userActivity.activityUser.userId}" />
                                        </h:link>
                                </h:column>
@@ -52,6 +52,14 @@
                                        </h:column>
                                </ui:fragment>
 
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{userActivity.activityPrincipalName}" />
+                               </h:column>
+
                                <h:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
@@ -89,7 +97,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg['ADMIN_ACTIVITY_' + userActivity.activityType]}" />
+                                       <h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />
                                </h:column>
 
                                <h:column>