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 85ca02fac1f2c043cb21e36ba1ad081ad6b6fe87..41ec650e1f501e15cb91dacb28f59f2ec9c46a3b 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -143,7 +143,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputUserAdminMiniLinks user="#{user}" />
+                                       <links:outputUserAdminDropdownMenu user="#{user}" />
                                </p:column>
                        </p:dataTable>
                </h:form>
@@ -176,7 +176,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="#{contactController.selectableContacts()}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
+                                                               />
                                                </p:selectOneMenu>
                                        </p:panelGrid>
                                </p:fieldset>
@@ -204,7 +210,6 @@
                                                        />
 
                                                <p:commandButton
-                                                       process="@form"
                                                        type="submit"
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"