Product-only:

- 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/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 2b706ae52fdee4ce015773a5cd6199c9e98a1229..f0110fad37b5083fed561df834a7e0eaf44d2a6e 100644 (file)
--- 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 f7f344a0ea5c8dbd68400b955ac6a96c85e7ec43..45ff9ea4d486519768c094211725ed9e9861cbee 100644 (file)
--- 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>