From 92e33b12772ca21727930bab16fc32b4a213d231 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 22 Dec 2018 02:10:22 +0100
Subject: [PATCH] Product-only: - added 2nd parameter for
 beanHelper.renderBasicData() - re-formatted JSF tag to have distinct lines
 for each attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../generic_product/admin_form_generic_product_data.tpl  | 2 +-
 .../generic_product/admin_generic_product_list.xhtml     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl
index 2b706ae5..f0110fad 100644
--- a/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl
+++ b/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl
@@ -119,7 +119,7 @@
 					value="#{basicDataListController.allBasicData}"
 					var="basicData"
 					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index f7f344a0..45ff9ea4 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -157,12 +157,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(product.productManufacturer)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" rendered="#{not empty product.productManufacturer}">
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(product.productManufacturer, true)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						rendered="#{not empty product.productManufacturer}"
+						>
 						<f:param name="basicDataId" value="#{product.productManufacturer.basicDataId}" />
 					</p:link>
 
-- 
2.39.5