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 d4652d6d40985b031e1034cfdaea064ab6201e7d..f99488b072ecd00cce0b679d83093f0dd110b326 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -52,17 +52,37 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_USER_ID}" sortBy="#{user.userId}" filterBy="#{user.userId}" filterMatchMode="contains">
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_ID}"
+                                       sortBy="#{user.userId}"
+                                       filterBy="#{user.userId}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_USER_NAME}" sortBy="#{user.userName}" filterBy="#{user.userName}" filterMatchMode="contains" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_USER_NAME}"
+                                       sortBy="#{user.userName}"
+                                       filterBy="#{user.userName}"
+                                       filterMatchMode="contains"
+                                       rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}"
+                                       >
                                        <h:outputText value="#{user.userName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" sortBy="#{user.userContact.contactPersonalTitle}" filterBy="#{user.userContact.contactPersonalTitle}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+                                       sortBy="#{user.userContact.contactPersonalTitle}"
+                                       filterBy="#{user.userContact.contactPersonalTitle}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
@@ -84,15 +104,30 @@
                                        <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}" sortBy="#{user.userContact.contactFirstName}" filterBy="#{user.userContact.contactFirstName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+                                       sortBy="#{user.userContact.contactFirstName}"
+                                       filterBy="#{user.userContact.contactFirstName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{user.userContact.contactFirstName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}" sortBy="#{user.userContact.contactFamilyName}" filterBy="#{user.userContact.contactFamilyName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+                                       sortBy="#{user.userContact.contactFamilyName}"
+                                       filterBy="#{user.userContact.contactFamilyName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{user.userContact.contactFamilyName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}" sortBy="#{user.userAccountStatus}" filterBy="#{user.userAccountStatus}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}"
+                                       sortBy="#{user.userAccountStatus}"
+                                       filterBy="#{user.userAccountStatus}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
@@ -114,7 +149,12 @@
                                        <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_USER_PROFILE_MODE}" sortBy="#{user.userProfileMode}" filterBy="#{user.userProfileMode}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_PROFILE_MODE}"
+                                       sortBy="#{user.userProfileMode}"
+                                       filterBy="#{user.userProfileMode}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
@@ -136,13 +176,21 @@
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{user.userCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="userCreated" value="#{user.userCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputUserAdminDropdownMenu user="#{user}" />
                                </p:column>
                        </p:dataTable>
@@ -176,7 +224,13 @@
                                                        filterMatchMode="contains"
                                                        >
                                                        <f:converter converterId="ContactConverter" />
-                                                       <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+
+                                                       <f:selectItems
+                                                               value="#{contactListController.allContacts}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
+                                                               />
                                                </p:selectOneMenu>
                                        </p:panelGrid>
                                </p:fieldset>
@@ -204,7 +258,6 @@
                                                        />
 
                                                <p:commandButton
-                                                       process="@form"
                                                        type="submit"
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"