X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fdepartment%2Fadmin_department_list.xhtml;h=612e2966a6141d0069c1e0a26d2b0365e830824d;hb=b96f7dfe61fdbc2e9a258b6ee40d7aa55872ac03;hp=a019fee0b7409b0b7bf7068b16a3559a293c6de7;hpb=88344c201dccb8ccc2dec09190ab3efd596ef210;p=jjobs-war.git

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index a019fee0..612e2966 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -73,10 +73,10 @@
 					</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="#{department.departmentCompany.companyName}" />
+						<h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" />
 					</h:outputLink>
 
-					<h:outputText value="#{department.departmentCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+					<h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
 				</p:column>
 
 				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
@@ -95,7 +95,7 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{department.departmentBranchOffice.branchId}" rendered="#{not empty department.departmentBranchOffice}">
+					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}" rendered="#{not empty department.departmentBranchOffice}">
 						<f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
 					</p:link>
 
@@ -129,7 +129,7 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+				<p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"