X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fadmin%2Fbranch_office%2Fadmin_form_branch_office_data.tpl;h=6b4e9f96126288aba08c8a8f86c8ce96d3e279c3;hb=7867cd61c382ac822e545c8dcca9e68b945c2158;hp=087447128ced5921b79f35eac2634946adfc016a;hpb=89644553a53c91191d8c17aa8098d7acb8a76b8d;p=jjobs-war.git

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 08744712..6b4e9f96 100644
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -27,9 +27,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
 				>
+
 				<f:converter converterId="BasicCompanyDataConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+				<f:selectItems
+					value="#{basicDataListController.allBasicData}"
+					var="basicData"
+					itemValue="#{basicData}"
+					itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
@@ -39,9 +47,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyEmployee"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_OWNER}" />
@@ -51,9 +67,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyEmployee"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
@@ -63,9 +87,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="branchUserOwner"
+					itemValue="#{branchUserOwner}"
+					itemLabel="#{beanHelper.renderContact(branchUserOwner.userContact)} (#{branchUserOwner.userName})"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />