</ui:include>
</ui:fragment>
- <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.allCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+ <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
<h:column>
<f:facet name="header">
<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>
</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}" />
<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>