Please cherry-pick:

- must be 'branchId'

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
index 0ed7ad15f06858bc3a4ddff8576558d31f3864d6..cc4f8dd1dea2520d1a6df9695efb514bad344729 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
@@ -10,21 +10,21 @@
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
                                        <h:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
-                                               <f:param name="branchOfficeId" value="#{branchOffice.branchOfficeId}" />
+                                               <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
                                <h:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
-                                       <f:param name="branchOfficeId" value="#{branchOffice.branchOfficeId}" />
+                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </li>
 
                        <li class="navlink-mini">
                                <h:link outcome="admin_delete_branch_office">
                                        <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
-                                       <f:param name="branchOfficeId" value="#{branchOffice.branchOfficeId}" />
+                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </li>
                </ul>

diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml
index 0a5e5b41b13498e24451fbd214980547e55cc50c..65fcb64bab39dfa88a40b2cb59cc9d24de1c46fe 100644 (file)
--- a/web/admin/branch_offices/admin_branch_offices_list.xhtml
+++ b/web/admin/branch_offices/admin_branch_offices_list.xhtml
@@ -25,7 +25,7 @@
                                </f:facet>
 
                                <h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
-                                       <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
+                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
@@ -39,7 +39,7 @@
                                </h:link>
 
                                <h:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
-                                       <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
+                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
@@ -83,7 +83,7 @@
                                </h:link>
 
                                <h:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
-                                       <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
+                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>