Don't cherry-pick:

[addressbook-war.git] / web / WEB-INF / templates / admin / basic_company_data / admin_form_basic_company_data.tpl

diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
index 2c486d5fc1398201b3273c3c708ea99428d82885..a890f91097832ae8ca160c3902480c9d68f59e87 100644 (file)
--- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
@@ -127,9 +127,9 @@
                                                filter="true"
                                                filterMatchMode="contains"
                                                >
-                                               <f:converter converterId="CompanyEmployeeConverter" />
+                                               <f:converter converterId="EmployeeConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                                               <f:selectItems value="#{companyEmployeeController.allEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>
@@ -150,9 +150,9 @@
                                                filter="true"
                                                filterMatchMode="contains"
                                                >
-                                               <f:converter converterId="CompanyEmployeeConverter" />
+                                               <f:converter converterId="EmployeeConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                                               <f:selectItems value="#{companyEmployeeController.allEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>