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 bbcb089350411b84b77001e536664a6750cbc649..26522083848e198b08314b0181bd2e8ca06eba05 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -85,7 +85,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-branch-offices:branch-office-details"
+                                       update="form-list-branch-offices:branch-office-details"
                                        oncomplete="PF('branchOfficeDialog').show()"
                                        />
 
@@ -166,7 +166,7 @@
                                                        <f:converter converterId="UserConverter" />
 
                                                        <f:selectItems
-                                                               value="#{userController.allUsers()}"
+                                                               value="#{userListController.allUsers}"
                                                                var="user"
                                                                itemValue="#{user}"
                                                                itemLabel="#{beanHelper.renderUser(user)}"
@@ -464,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>
@@ -512,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>