From d0ed0869aedbd0d709507837e2e2545d4c51b760 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 | 110 ++++++++++-------- .../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, 67 insertions(+), 59 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 cf0dee81..7124369c 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/user/admin_user_list.xhtml @@ -730,53 +730,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 @@ -784,7 +784,7 @@ admin_assign_headquarter_owner - /admin/headquarter/admin_headquarter_assign_owner.xhtml + /admin/business/headquarter/admin_headquarter_assign_owner.xhtml admin_show_contact @@ -792,22 +792,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 @@ -815,11 +815,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 @@ -827,7 +827,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 @@ -839,34 +839,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 @@ -874,61 +874,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/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/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