Please cherry-pick:

[jjobs-war.git] / web / admin / employee / admin_employee_list.xhtml

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 399f38fd26130e850b15d0df42ffe575a358dda7..94b2457365f765512532fe6307b22c01519155c7 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -132,14 +132,14 @@
                                                                value="#{branchOfficeListController.allBranchOffices}"
                                                                var="branchOffice"
                                                                itemValue="#{branchOffice}"
-                                                               itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+                                                               itemLabel="#{beanHelper.renderBranchOffice(branchOffice, false)}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                        <p:link
                                                outcome="admin_show_branch_office"
-                                               value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
+                                               value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice, false)}"
                                                title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
                                                rendered="#{not empty employee.employeeBranchOffice}"
                                                >
@@ -221,14 +221,14 @@
                                                                value="#{basicDataListController.allBasicData}"
                                                                var="basicData"
                                                                itemValue="#{basicData}"
-                                                               itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
+                                                               itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                        <p:link
                                                outcome="admin_show_basic_data"
-                                               value="#{beanHelper.renderBasicData(employee.employeeBasicData, true)}"
+                                               value="#{beanHelper.renderBasicData(employee.employeeBasicData, true, false)}"
                                                title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
                                                >
                                                <f:param name="basicDataId" value="#{employee.employeeBasicData.basicDataId}" />