From 5e988d3b48ab7d25b999f5141cb47c4c1cee0cf0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 3 Nov 2022 13:51:54 +0100 Subject: [PATCH] Please cherry-pick: - moved related files for jcontact-business-core to own "business" folder - updated navigation rules accordingly --- web/WEB-INF/faces-config.xml | 114 +++++++++--------- .../admin_form_branch_office_data.tpl | 0 .../admin_form_branch_opening_time.tpl | 0 .../department/admin_form_department_data.tpl | 0 .../employee/admin_form_employee_data.tpl | 0 .../admin_form_headquarter_data.tpl | 0 .../admin_form_headquarter_opening_time.tpl | 0 .../opening_time/admin_form_opening_time.tpl | 0 .../basic_data/admin_basic_data_list.xhtml | 0 .../admin_branch_office_edit.xhtml | 2 +- .../admin_branch_office_list.xhtml | 4 +- .../department/admin_department_edit.xhtml | 2 +- .../department/admin_department_list.xhtml | 0 .../employee/admin_employee_list.xhtml | 2 +- .../headquarter/admin_headquarter_list.xhtml | 4 +- .../admin_opening_time_list.xhtml | 2 +- 16 files changed, 65 insertions(+), 65 deletions(-) rename web/WEB-INF/templates/admin/{ => business}/branch_office/admin_form_branch_office_data.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/branch_office/admin_form_branch_opening_time.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/department/admin_form_department_data.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/employee/admin_form_employee_data.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/headquarter/admin_form_headquarter_data.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/headquarter/admin_form_headquarter_opening_time.tpl (100%) rename web/WEB-INF/templates/admin/{ => business}/opening_time/admin_form_opening_time.tpl (100%) rename web/admin/{ => business}/basic_data/admin_basic_data_list.xhtml (100%) rename web/admin/{ => business}/branch_office/admin_branch_office_edit.xhtml (96%) rename web/admin/{ => business}/branch_office/admin_branch_office_list.xhtml (99%) rename web/admin/{ => business}/department/admin_department_edit.xhtml (95%) rename web/admin/{ => business}/department/admin_department_list.xhtml (100%) rename web/admin/{ => business}/employee/admin_employee_list.xhtml (99%) rename web/admin/{ => business}/headquarter/admin_headquarter_list.xhtml (98%) rename web/admin/{ => business}/opening_time/admin_opening_time_list.xhtml (98%) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 3e65dd50..886a14ed 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -110,27 +110,27 @@ admin_list_headquarters - /admin/headquarter/admin_headquarter_list.xhtml + /admin/business/headquarter/admin_headquarter_list.xhtml admin_list_basic_data - /admin/basic_data/admin_basic_data_list.xhtml + /admin/business/basic_data/admin_basic_data_list.xhtml admin_list_branch_offices - /admin/branch_office/admin_branch_office_list.xhtml + /admin/business/branch_office/admin_branch_office_list.xhtml admin_list_departments - /admin/department/admin_department_list.xhtml + /admin/business/department/admin_department_list.xhtml admin_list_opening_times - /admin/opening_time/admin_opening_time_list.xhtml + /admin/business/opening_time/admin_opening_time_list.xhtml admin_list_employees - /admin/employee/admin_employee_list.xhtml + /admin/business/employee/admin_employee_list.xhtml admin_list_product_categories @@ -751,53 +751,53 @@ - /admin/basic_data/admin_basic_data_list.xhtml + /admin/business/basic_data/admin_basic_data_list.xhtml admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml admin_edit_basic_data - /admin/basic_data/admin_basic_data_edit.xhtml + /admin/business/basic_data/admin_basic_data_edit.xhtml admin_delete_basic_data - /admin/basic_data/admin_basic_data_delete.xhtml + /admin/business/basic_data/admin_basic_data_delete.xhtml admin_assign_basic_data_contact - /admin/basic_data/admin_basic_data_assign_contact.xhtml + /admin/business/basic_data/admin_basic_data_assign_contact.xhtml admin_assign_basic_data_founder - /admin/basic_data/admin_basic_data_assign_founder.xhtml + /admin/business/basic_data/admin_basic_data_assign_founder.xhtml admin_assign_basic_data_owner - /admin/basic_data/admin_basic_data_assign_owner.xhtml + /admin/business/basic_data/admin_basic_data_assign_owner.xhtml admin_show_employee - /admin/employee/admin_employee_show.xhtml + /admin/business/employee/admin_employee_show.xhtml admin_assign_basic_data_employee - /admin/basic_data/admin_basic_data_assign_employee.xhtml + /admin/business/basic_data/admin_basic_data_assign_employee.xhtml - /admin/headquarter/admin_headquarter_list.xhtml + /admin/business/headquarter/admin_headquarter_list.xhtml admin_show_headquarter - /admin/headquarter/admin_headquarter_show.xhtml + /admin/business/headquarter/admin_headquarter_show.xhtml admin_edit_headquarter - /admin/headquarter/admin_headquarter_edit.xhtml + /admin/business/headquarter/admin_headquarter_edit.xhtml admin_delete_headquarter - /admin/headquarter/admin_headquarter_delete.xhtml + /admin/business/headquarter/admin_headquarter_delete.xhtml admin_show_user @@ -805,7 +805,7 @@ admin_assign_headquarter_owner - /admin/headquarter/admin_headquarter_assign_owner.xhtml + /admin/business/headquarter/admin_headquarter_assign_owner.xhtml admin_show_contact @@ -813,22 +813,22 @@ admin_assign_headquarter_contact - /admin/headquarter/admin_headquarter_assign_contact.xhtml + /admin/business/headquarter/admin_headquarter_assign_contact.xhtml - /admin/branch_office/admin_branch_office_list.xhtml + /admin/business/branch_office/admin_branch_office_list.xhtml admin_show_branch_office - /admin/branch_office/admin_branch_office_show.xhtml + /admin/business/branch_office/admin_branch_office_show.xhtml admin_edit_branch_office - /admin/branch_office/admin_branch_office_edit.xhtml + /admin/business/branch_office/admin_branch_office_edit.xhtml admin_delete_branch_office - /admin/branch_office/admin_branch_office_delete.xhtml + /admin/business/branch_office/admin_branch_office_delete.xhtml admin_show_user @@ -836,11 +836,11 @@ admin_assign_branch_office_owner - /admin/branch_office/admin_branch_office_assign_owner.xhtml + /admin/business/branch_office/admin_branch_office_assign_owner.xhtml admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml admin_show_contact @@ -848,7 +848,7 @@ admin_assign_branch_office_contact - /admin/branch_office/admin_branch_office_assign_contact.xhtml + /admin/business/branch_office/admin_branch_office_assign_contact.xhtml admin_show_fax @@ -860,34 +860,34 @@ - /admin/branch_office/admin_branch_office_edit.xhtml + /admin/business/branch_office/admin_branch_office_edit.xhtml admin_list_branch_offices - /admin/branch_office/admin_branch_office_list.xhtml + /admin/business/branch_office/admin_branch_office_list.xhtml - /admin/department/admin_department_list.xhtml + /admin/business/department/admin_department_list.xhtml admin_show_department - /admin/department/admin_department_show.xhtml + /admin/business/department/admin_department_show.xhtml admin_edit_department - /admin/department/admin_department_edit.xhtml + /admin/business/department/admin_department_edit.xhtml admin_delete_department - /admin/department/admin_department_delete.xhtml + /admin/business/department/admin_department_delete.xhtml admin_show_branch_office - /admin/branch_office/admin_branch_office_show.xhtml + /admin/business/branch_office/admin_branch_office_show.xhtml admin_assign_department_branch_office - /admin/department/admin_assign_department_branch_office.xhtml + /admin/business/department/admin_assign_department_branch_office.xhtml admin_show_contact @@ -895,69 +895,69 @@ admin_assign_department_lead - /admin/department/admin_assign_department_lead.xhtml + /admin/business/department/admin_assign_department_lead.xhtml admin_assign_department_user - /admin/department/admin_assign_department_user.xhtml + /admin/business/department/admin_assign_department_user.xhtml admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml - /admin/department/admin_department_edit.xhtml + /admin/business/department/admin_department_edit.xhtml admin_list_departments - /admin/department/admin_department_list.xhtml + /admin/business/department/admin_department_list.xhtml - /admin/employee/admin_employee_list.xhtml + /admin/business/employee/admin_employee_list.xhtml admin_show_employee - /admin/employee/admin_employee_show.xhtml + /admin/business/employee/admin_employee_show.xhtml admin_edit_employee - /admin/employee/admin_employee_edit.xhtml + /admin/business/employee/admin_employee_edit.xhtml admin_delete_employee - /admin/employee/admin_employee_delete.xhtml + /admin/business/employee/admin_employee_delete.xhtml admin_show_branch_office - /admin/branch_office/admin_branch_office_show.xhtml + /admin/business/branch_office/admin_branch_office_show.xhtml admin_assign_user_owner - /admin/employee/admin_assign_employee_user.xhtml + /admin/business/employee/admin_assign_employee_user.xhtml admin_assign_branch_office - /admin/employee/admin_assign_employee_branch_office.xhtml + /admin/business/employee/admin_assign_employee_branch_office.xhtml admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml - /admin/opening_time/admin_opening_time_list.xhtml + /admin/business/opening_time/admin_opening_time_list.xhtml admin_show_opening_time - /admin/opening_time/admin_opening_time_show.xhtml + /admin/business/opening_time/admin_opening_time_show.xhtml admin_edit_opening_time - /admin/opening_time/admin_opening_time_edit.xhtml + /admin/business/opening_time/admin_opening_time_edit.xhtml admin_delete_opening_time - /admin/opening_time/admin_opening_time_delete.xhtml + /admin/business/opening_time/admin_opening_time_delete.xhtml @@ -1007,7 +1007,7 @@ admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml @@ -1034,7 +1034,7 @@ admin_show_branch_office - /admin/branch_office/admin_branch_office_show.xhtml + /admin/business/branch_office/admin_branch_office_show.xhtml admin_assign_receipt_user @@ -1050,7 +1050,7 @@ admin_show_employee - /admin/employee/admin_employee_show.xhtml + /admin/business/employee/admin_employee_show.xhtml admin_assign_receipt_seller @@ -1089,7 +1089,7 @@ admin_show_basic_data - /admin/basic_data/admin_basic_data_show.xhtml + /admin/business/basic_data/admin_basic_data_show.xhtml admin_show_product_category diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl similarity index 100% rename from web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl rename to web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl similarity index 100% rename from web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl rename to web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl similarity index 100% rename from web/WEB-INF/templates/admin/department/admin_form_department_data.tpl rename to web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl similarity index 100% rename from web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl rename to web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_data.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl similarity index 100% rename from web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_data.tpl rename to web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_opening_time.tpl similarity index 100% rename from web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl rename to web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_opening_time.tpl diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/business/opening_time/admin_form_opening_time.tpl similarity index 100% rename from web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl rename to web/WEB-INF/templates/admin/business/opening_time/admin_form_opening_time.tpl diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/business/basic_data/admin_basic_data_list.xhtml similarity index 100% rename from web/admin/basic_data/admin_basic_data_list.xhtml rename to web/admin/business/basic_data/admin_basic_data_list.xhtml diff --git a/web/admin/branch_office/admin_branch_office_edit.xhtml b/web/admin/business/branch_office/admin_branch_office_edit.xhtml similarity index 96% rename from web/admin/branch_office/admin_branch_office_edit.xhtml rename to web/admin/business/branch_office/admin_branch_office_edit.xhtml index 12fdd25f..1bc3e95b 100644 --- a/web/admin/branch_office/admin_branch_office_edit.xhtml +++ b/web/admin/business/branch_office/admin_branch_office_edit.xhtml @@ -67,7 +67,7 @@ - + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/business/branch_office/admin_branch_office_list.xhtml similarity index 99% rename from web/admin/branch_office/admin_branch_office_list.xhtml rename to web/admin/business/branch_office/admin_branch_office_list.xhtml index 3eb65bed..c28d1e6c 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/business/branch_office/admin_branch_office_list.xhtml @@ -488,7 +488,7 @@ - + @@ -536,7 +536,7 @@ - + diff --git a/web/admin/department/admin_department_edit.xhtml b/web/admin/business/department/admin_department_edit.xhtml similarity index 95% rename from web/admin/department/admin_department_edit.xhtml rename to web/admin/business/department/admin_department_edit.xhtml index fd1917db..ab4b6e1e 100644 --- a/web/admin/department/admin_department_edit.xhtml +++ b/web/admin/business/department/admin_department_edit.xhtml @@ -58,7 +58,7 @@ - + diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/business/department/admin_department_list.xhtml similarity index 100% rename from web/admin/department/admin_department_list.xhtml rename to web/admin/business/department/admin_department_list.xhtml diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/business/employee/admin_employee_list.xhtml similarity index 99% rename from web/admin/employee/admin_employee_list.xhtml rename to web/admin/business/employee/admin_employee_list.xhtml index 94b24573..c6e460c5 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/business/employee/admin_employee_list.xhtml @@ -356,7 +356,7 @@ - + diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/business/headquarter/admin_headquarter_list.xhtml similarity index 98% rename from web/admin/headquarter/admin_headquarter_list.xhtml rename to web/admin/business/headquarter/admin_headquarter_list.xhtml index 28cd7296..9bc2aa46 100644 --- a/web/admin/headquarter/admin_headquarter_list.xhtml +++ b/web/admin/business/headquarter/admin_headquarter_list.xhtml @@ -310,7 +310,7 @@ - + @@ -392,7 +392,7 @@ - + diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/business/opening_time/admin_opening_time_list.xhtml similarity index 98% rename from web/admin/opening_time/admin_opening_time_list.xhtml rename to web/admin/business/opening_time/admin_opening_time_list.xhtml index 5c9d3b97..6d48764a 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/business/opening_time/admin_opening_time_list.xhtml @@ -262,7 +262,7 @@ - + -- 2.39.5