Please 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 2a6b503be9fbaa73550696aefb3a6710afe483af..54ed8dc8effd3b9ada91270cb5d6f692c93e763e 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -885,6 +885,10 @@
                        <from-outcome>admin_assign_department_user</from-outcome>
                        <to-view-id>/admin/department/admin_assign_department_user.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>
        <navigation-rule>
                <from-view-id>/admin/employee/admin_employee_list.xhtml</from-view-id>
@@ -912,6 +916,10 @@
                        <from-outcome>admin_assign_branch_office</from-outcome>
                        <to-view-id>/admin/employee/admin_assign_employee_branch_office.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>
        <navigation-rule>
                <from-view-id>/admin/opening_time/admin_opening_time_list.xhtml</from-view-id>

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index fe196f4f1cd93fab1c591aed058451d38c4ca1d3..12049dd440582acea8372449098e5c9e45d97bc8 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -93,11 +93,9 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
-                                               <h:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" />
-                                       </h:outputLink>
-
-                                       <h:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
+                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+                                               <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
+                                       </p:link>
                                </p:column>
 
                                <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 64ee433ebd83c54b2cdf0aca8ebb0b8a669f2bc1..cd1597bd1710d67304ea04bf41b0718154f46505 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -72,11 +72,9 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <h:outputLink value="#{department.departmentCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty department.departmentCompany.companyWebsiteUrl}">
-                                               <h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" />
-                                       </h:outputLink>
-
-                                       <h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+                                               <f:param name="basicDataId" value="#{department.departmentCompany.basicDataId}" />
+                                       </p:link>
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 7d3ea7d79e7d8b54c69e98ab8229f2f4a84cc55b..59316f7eefebba4f53fff70d1fe80afc0809a671 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -117,11 +117,9 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <h:outputLink value="#{employee.employeeBasicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeBasicData.companyWebsiteUrl}">
-                                               <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" />
-                                       </h:outputLink>
-
-                                       <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeBasicData.companyWebsiteUrl}" />
+                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+                                               <f:param name="basicDataId" value="#{employee.employeeBasicData.basicDataId}" />
+                                       </p:link>
                                </p:column>
 
                                <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">