Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / employee / admin_form_employee_data.tpl

diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index 290b73ffe788490ca0f3613bb7f33b6b2e8d95d3..85c42867b7793df3dc2a2a4452e5782175b05ae8 100644 (file)
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -30,13 +30,18 @@
 
                                <f:converter converterId="BasicCompanyDataConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.PLEASE_SELECT}"
+                                       noSelectionOption="true"
+                                       itemDisabled="true"
+                                       />
 
                                <f:selectItems
                                        value="#{basicDataListController.allBasicData}"
                                        var="basicData"
                                        itemValue="#{basicData}"
-                                       itemLabel="#{basicData.companyName}"
+                                       itemLabel="#{beanHelper.renderBasicData(basicData)}"
                                        />
                        </p:selectOneMenu>
 
@@ -73,7 +78,7 @@
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 
                                <f:selectItems
-                                       value="#{contactController.allContacts()}"
+                                       value="#{contactListController.allContacts}"
                                        var="contact"
                                        itemValue="#{contact}"
                                        itemLabel="#{beanHelper.renderContact(contact)}"