Refactured a lot:

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

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index c0168f1d14f3667c3cfdf4c7fb2be4a9bfa5fc2c..11ead762e7f4dfd3768a77e8369b73cd802f71ad 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -16,9 +16,9 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:dataTable id="table_list_users" var="user" value="#{adminUserController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{adminUserController.hasUsers()}">
+                       <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{userController.hasUsers()}">
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_ID}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_USER_ID}</f:facet>
 
                                        <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
                                                <f:param name="userId" value="#{user.userId}" />
@@ -26,43 +26,43 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_NAME}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_USER_NAME}</f:facet>
 
                                        <h:outputText value="#{user.userName}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_GENDER}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CONTACT_GENDER}</f:facet>
 
                                        <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_FIRST_NAME}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FIRST_NAME}</f:facet>
 
                                        <h:outputText value="#{user.userContact.contactFirstName}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_FAMILY_NAME}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FAMILY_NAME}</f:facet>
 
                                        <h:outputText value="#{user.userContact.contactFamilyName}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_USER_ACCOUNT_STATUS}</f:facet>
 
                                        <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_PROFILE_MODE}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_USER_PROFILE_MODE}</f:facet>
 
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_USER_CREATED}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_USER_CREATED}</f:facet>
 
                                        <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />