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 d46cc09351cc21c65350452af1efc9aaaa3bf69d..f9613d876d8d78a201a7911ff9c3b75eaf7a476e 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -8,7 +8,7 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>
@@ -83,7 +83,7 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_MESSAGE}" />
                                </f:facet>
 
                                <h:outputText value="#{userActivity.activityMessage}" />
@@ -91,7 +91,7 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TYPE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />