From 80c4d73f0474bfc64216e213f1dae6cfc070e092 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 13 Sep 2017 01:03:48 +0200
Subject: [PATCH] Please cherry-pick: - must be 'branchId'
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../links/mini/branch_office/admin_branch_office_links.tpl  | 6 +++---
 web/admin/branch_offices/admin_branch_offices_list.xhtml    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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 0ed7ad15..cc4f8dd1 100644
--- 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 0a5e5b41..65fcb64b 100644
--- 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>
 
-- 
2.39.5