Don't cherry-pick:

- if for example an employee is assigned to a company (basic_data) then always
  link the "show basic data" view and not the company's website URL

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

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 54ed8dc8effd3b9ada91270cb5d6f692c93e763e..43aeae355b646c7945a5bf891320a6fc0e7b6321 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -1035,6 +1035,10 @@
                        <from-outcome>admin_show_generic_product</from-outcome>
                        <to-view-id>/admin/generic_product/admin_generic_product_show.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_basic_data</from-outcome>
+                       <to-view-id>/admin/basic_data/admin_basic_data_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <!--
        <factory>

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 1265d4f77e293848548a8fad4c37332c08bba3e5..5fc51f1148bc7055abb24a197f712b41681ffe05 100644 (file)
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -97,7 +97,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{project.ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER}" sortBy="#{item.itemManufacturer.companyName}" filterBy="#{item.itemManufacturer}" filterMatchMode="in">
+                               <p:column headerText="#{project.ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER}" sortBy="#{receiptItem.itemManufacturer.companyName}" filterBy="#{receiptItem.itemManufacturer}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -112,19 +112,11 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link
-                                               href="#{item.itemManufacturer.companyWebsiteUrl}"
-                                               target="_blank"
-                                               title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}"
-                                               rel="external"
-                                               rendered="#{not empty item.itemManufacturer.companyWebsiteUrl and not empty item.itemManufacturer.companyName}"
-                                               >
-                                               <h:outputText value="#{item.itemManufacturer.companyName}" />
+                                       <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}">
+                                               <f:param name="basicDataId" value="#{receiptItem.itemManufacturer.basicDataId}" />
                                        </p:link>
 
-                                       <h:outputText value="#{item.itemManufacturer.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty item.itemManufacturer.companyWebsiteUrl and not empty item.itemManufacturer.companyName}" />
-
-                                       <h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{project.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty item.itemManufacturer}" />
+                                       <h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{project.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty receiptItem.itemManufacturer}" />
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{receipt.receiptCreated}" filterable="false">