Please cherry-pick:

[jjobs-war.git] / web / admin / branch_office / admin_branch_office_list.xhtml

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index f155a9a3e1f0a6847e38e9fa2c65b696d9c81099..26522083848e198b08314b0181bd2e8ca06eba05 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -55,8 +55,17 @@
                                                        layout="grid"
                                                        styleClass="ui-noborder"
                                                        >
-                                                       <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
-                                                       <p:inputText id="globalFilter" onkeyup="PF('branchOfficeList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
+
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('branchOfficeList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
                                                </p:panelGrid>
 
                                                <p:outputPanel>
@@ -76,7 +85,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-branch-offices:branchOffice-details"
+                                       update="form-list-branch-offices:branch-office-details"
                                        oncomplete="PF('branchOfficeDialog').show()"
                                        />
 
@@ -157,7 +166,7 @@
                                                        <f:converter converterId="UserConverter" />
 
                                                        <f:selectItems
-                                                               value="#{userController.allUsers()}"
+                                                               value="#{userListController.allUsers}"
                                                                var="user"
                                                                itemValue="#{user}"
                                                                itemLabel="#{beanHelper.renderUser(user)}"
@@ -282,8 +291,9 @@
                                widgetVar="branchOfficeDialog"
                                position="top"
                                responsive="true"
+                               closeOnEscape="true"
                                >
-                               <p:outputPanel id="branchOffice-details">
+                               <p:outputPanel id="branch-office-details">
                                        <p:tabView>
                                                <p:tab title="#{msg.ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE}">
                                                        <p:panelGrid columns="2" rendered="#{not empty branchOfficeListController.selectedBranchOffice}">
@@ -401,7 +411,7 @@
                                                                <p:outputLabel value="#{msg.SUITE_NUMBER_HEADER}" title="#{msg.SUITE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
                                                                <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchSuiteNumber}" />
 
-                                                               <p:outputLabel value="#{msg.ZIP_CODE_HEADER}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <p:outputLabel value="#{msg.DATA_ZIP_CODE}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
                                                                <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchZipCode}" />
 
                                                                <p:outputLabel value="#{msg.CITY_HEADER}" title="#{msg.CITY_OF_BRANCH_OFFICE_TITLE}" />
@@ -454,7 +464,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
                                                        action="#{adminBranchOfficeController.addBranchOffice()}"
-                                                       update=":master:form-list-branch-offices:branchOfficeList"
+                                                       update="form-list-branch-offices:branchOfficeList"
                                                        oncomplete="PF('branchOfficeList').filter()"
                                                        />
                                        </p:panelGrid>
@@ -502,7 +512,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}"
                                                        action="#{adminBranchOfficeController.addOpeningTime()}"
-                                                       update=":master:form-list-branch-opening-time:branchOpeningTimeList"
+                                                       update="form-list-branch-opening-time:branchOpeningTimeList"
                                                        oncomplete=""
                                                        />
                                        </p:panelGrid>