From: Roland Häder <roland@mxchange.org>
Date: Tue, 12 Sep 2017 19:20:48 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=801f3ece2e71b4eb56cceb442efb9f351c93f801;p=addressbook-war.git

Please cherry-pick:
- renamed companyData* -> basicData*

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java
index ab9566ff..ddf4d2a8 100644
--- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java
@@ -41,7 +41,7 @@ import org.mxchange.jcountry.model.data.Country;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("companyDataController")
+@Named ("basicDataController")
 @RequestScoped
 public class AddressbookBusinessDataWebRequestBean extends BaseAddressbookController implements AddressbookBusinessDataWebRequestController {
 
diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
index 06d13257..8eaab292 100644
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
@@ -21,7 +21,7 @@
 					<h:selectOneMenu styleClass="select" id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
 						<f:converter converterId="BasicCompanyDataConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-						<f:selectItems value="#{companyDataController.allCompanyBasicData()}" var="companyData" itemValue="#{companyData}" itemLabel="#{companyData.companyName}" />
+						<f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
index 4daa7b2a..31e384e0 100644
--- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
+++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
@@ -15,16 +15,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{basicDataController.allCompanyBasicData().isEmpty()}" />
 
-		<h:dataTable id="table_list_basic_company_data" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" rendered="#{not companyDataController.allCompanyBasicData().isEmpty()}">
+		<h:dataTable id="table_list_basic_company_data" var="basicData" value="#{basicDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" rendered="#{not basicDataController.allCompanyBasicData().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{companyData.basicDataId}">
-					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				<h:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 				</h:link>
 			</h:column>
 
@@ -33,12 +33,12 @@
 					<h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{companyData.companyUserOwner.userId}" rendered="#{not empty companyData.companyUserOwner}">
-					<f:param name="userId" value="#{companyData.companyUserOwner.userId}" />
+				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
+					<f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
 				</h:link>
 
-				<h:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty companyData.companyUserOwner}">
-					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				<h:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 				</h:link>
 			</h:column>
 
@@ -47,11 +47,11 @@
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
 				</f:facet>
 
-				<h:outputLink value="#{companyData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty companyData.companyWebsiteUrl}">
-					<h:outputText value="#{companyData.companyName}" />
+				<h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
+					<h:outputText value="#{basicData.companyName}" />
 				</h:outputLink>
 
-				<h:outputText value="#{companyData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty companyData.companyWebsiteUrl}" />
+				<h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
 			</h:column>
 
 			<h:column>
@@ -59,12 +59,12 @@
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{companyData.companyContactEmployee.employeeId}" rendered="#{not empty companyData.companyContactEmployee}">
-					<f:param name="employeeId" value="#{companyData.companyContactEmployee.employeeId}" />
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
+					<f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
 				</h:link>
 
-				<h:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty companyData.companyContactEmployee}">
-					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				<h:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 				</h:link>
 			</h:column>
 
@@ -73,12 +73,12 @@
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{companyData.companyFounder.employeeId}" rendered="#{not empty companyData.companyFounder}">
-					<f:param name="employeeId" value="#{companyData.companyFounder.employeeId}" />
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
+					<f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
 				</h:link>
 
-				<h:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty companyData.companyFounder}">
-					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				<h:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 				</h:link>
 			</h:column>
 
@@ -87,7 +87,7 @@
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_CREATED}" />
 				</f:facet>
 
-				<h:outputText id="companyCreated" value="#{companyData.companyCreated.time}">
+				<h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
 					<f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
 			</h:column>