From: Roland Häder <roland@mxchange.org>
Date: Sat, 22 Dec 2018 01:12:27 +0000 (+0100)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aada97b26ba8efa902c9d6384665bfe400d23ad2;p=jfinancials-war.git

Don't cherry-pick:
- used beanHelper.renderBasicData() instead of direct access to BasicData's
  properties
- added 2nd parameter for beanHelper.renderBasicData()
- re-formatted JSF tag to have distinct lines for each attribute

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

diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index 41a41516..8ae98f77 100644
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -92,7 +92,7 @@
 					var="employee"
 					itemValue="#{employee}"
 					itemLabel="#{beanHelper.renderEmployee(employee)}"
-					itemDescription="#{employee.employeeBasicData.companyName}, #{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
+					itemDescription="#{beanHelper.renderBasicData(employee.employeeBasicData, true)}, #{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
index 95eb23ba..495e7043 100644
--- a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
@@ -74,7 +74,7 @@
 					value="#{basicDataListController.allBasicData}"
 					var="basicData"
 					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index ac0da8b7..3b2c1444 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -151,12 +151,17 @@
 								value="#{basicDataListController.allBasicData}"
 								var="basicData"
 								itemValue="#{basicData}"
-								itemLabel="#{basicData.companyName}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(receiptItem.itemManufacturer)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" rendered="#{not empty receiptItem.itemManufacturer}">
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(receiptItem.itemManufacturer, true)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						rendered="#{not empty receiptItem.itemManufacturer}"
+						>
 						<f:param name="basicDataId" value="#{receiptItem.itemManufacturer.basicDataId}" />
 					</p:link>