From 20aae0a16c854f4a65454d1bb2c02e124740c7a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 12 Sep 2017 21:20:48 +0200 Subject: [PATCH] Please cherry-pick: - renamed companyData* -> basicData* MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../PizzaBusinessDataWebRequestBean.java | 2 +- .../admin_form_branch_offices_data.tpl | 2 +- .../admin_basic_company_data_list.xhtml | 40 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java index af363b4a..e4e18f19 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java @@ -41,7 +41,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo *

* @author Roland Häder */ -@Named ("companyDataController") +@Named ("basicDataController") @RequestScoped public class PizzaBusinessDataWebRequestBean extends BasePizzaController implements PizzaBusinessDataWebRequestController { 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 @@ - + 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 @@ - + - + - - + + @@ -33,12 +33,12 @@ - - + + - - + + @@ -47,11 +47,11 @@ - - + + - + @@ -59,12 +59,12 @@ - - + + - - + + @@ -73,12 +73,12 @@ - - + + - - + + @@ -87,7 +87,7 @@ - + -- 2.39.5