Please cherry-pick:

[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 1f8eb8ff0a112ae870f2e7f3d5834bcd29ffceb0..d3cff187a679c8bffe8c4ec3df277dab642b1d1d 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-users">
                        <p:dataTable
-                               id="table-list-users"
+                               id="userList"
                                var="user"
                                value="#{userController.allUsers()}"
                                tableStyleClass="table table-full"
@@ -41,7 +41,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                               <p:columnToggler datasource="table-list-users" trigger="toggler" />
+                                               <p:columnToggler datasource="userList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
 
@@ -65,7 +65,6 @@
                                                        title="#{msg.FILTER_BY_SINGLE_PERSONAL_TITLE}"
                                                        >
                                                        <f:converter converterId="PersonalTitleConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                        <f:selectItems
                                                                value="#{dataController.personalTitles}"
                                                                var="personalTitle"
@@ -96,7 +95,6 @@
                                                        title="#{msg.FILTER_BY_SINGLE_ACCOUNT_STATUS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserAccountStatusConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                        <f:selectItems
                                                                value="#{dataController.userAccountStatuses}"
                                                                var="accountStatus"
@@ -119,7 +117,6 @@
                                                        title="#{msg.FILTER_BY_SINGLE_PROFILE_MODE_TITLE}"
                                                        >
                                                        <f:converter converterId="ProfileModeConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                        <f:selectItems
                                                                value="#{dataController.profileModes}"
                                                                var="profileMode"
@@ -132,13 +129,13 @@
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
                                        <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputUserAdminMiniLinks user="#{user}" />
                                </p:column>
                        </p:dataTable>
@@ -164,7 +161,6 @@
                                                        filterMatchMode="contains"
                                                        >
                                                        <f:converter converterId="ContactConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                        <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                </p:selectOneMenu>
                                        </p:panelGrid>
@@ -195,7 +191,7 @@
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"
                                                        action="#{adminUserController.addUser()}"
-                                                       update=":master:form-list-users:table-list-users"
+                                                       update=":master:form-list-users:userList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>