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..f0532eae4bc5ba38df84d1465337c06981029cf5 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -282,6 +282,7 @@
                                widgetVar="branchOfficeDialog"
                                position="top"
                                responsive="true"
+                               closeOnEscape="true"
                                >
                                <p:outputPanel id="branchOffice-details">
                                        <p:tabView>
@@ -401,7 +402,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}" />