Please cherry-pick:

[jjobs-war.git] / web / admin / headquarter / admin_headquarter_list.xhtml

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index 089a71f1b1127cfb934c8cbd3df4e78db83bae3f..297a5c74503426530cc262b9327b32173e2fdca5 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -54,8 +54,17 @@
                                                        layout="grid"
                                                        styleClass="ui-noborder"
                                                        >
-                                                       <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
-                                                       <p:inputText id="globalFilter" onkeyup="PF('headquarterList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
+
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('departmentList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
                                                </p:panelGrid>
 
                                                <p:outputPanel>
@@ -75,7 +84,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-headquarters:headquarter-details"
+                                       update="form-list-headquarters:headquarter-details"
                                        oncomplete="PF('headquarterDialog').show()"
                                        />
 
@@ -111,7 +120,7 @@
                                                        <f:converter converterId="UserConverter" />
 
                                                        <f:selectItems
-                                                               value="#{userController.allUsers()}"
+                                                               value="#{userListController.allUsers}"
                                                                var="user"
                                                                itemValue="#{user}"
                                                                itemLabel="#{beanHelper.renderUser(user)}"
@@ -180,17 +189,17 @@
                                                        <f:converter converterId="EmployeeConverter" />
 
                                                        <f:selectItems
-                                                               value="#{employeeController.allEmployees()}"
+                                                               value="#{employeeListController.allEmployees}"
                                                                var="employee"
                                                                itemValue="#{employee}"
-                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee, false)}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                        <p:link
                                                outcome="admin_show_employee"
-                                               value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}"
+                                               value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee, false)}"
                                                title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
                                                rendered="#{not empty headquarter.headquarterContactEmployee}"
                                                >
@@ -222,7 +231,32 @@
                                        sortable="false"
                                        filterable="false"
                                        >
-                                       <links:outputHeadquarterAdminDropdownMenu headquarter="#{headquarter}" />
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem
+                                                       outcome="admin_show_headquarter"
+                                                       value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}"
+                                                       >
+                                                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem
+                                                       outcome="admin_edit_headquarter"
+                                                       value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_EDIT_HEADQUARTER_TITLE}"
+                                                       >
+                                                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_delete_headquarter">
+                                                       <h:outputText
+                                                               styleClass="link-danger"
+                                                               value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                               title="#{msg.ADMIN_LINK_DELETE_HEADQUARTER_TITLE}"
+                                                               />
+                                                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
                                </p:column>
                        </p:dataTable>
 
@@ -281,7 +315,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
                                                        action="#{adminHeadquarterController.addHeadquarter()}"
-                                                       update=":master:form-list-headquarters:headquarterList"
+                                                       update="form-list-headquarters:headquarterList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
@@ -362,7 +396,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
                                                        action="#{adminHeadquarterController.addOpeningTime()}"
-                                                       update=":master:form-list-headquarter-opening-time:headquarterOpeningTimeList"
+                                                       update="form-list-headquarter-opening-time:headquarterOpeningTimeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>