From: Roland Häder Date: Mon, 11 May 2020 02:00:31 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=363f594ea14a494a01383efb007242f4e427ba4e;p=jfinancials-war.git Please cherry-pick: - "list" views may list more than one entity and should be plural Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java index cf9d8eec..3adc086e 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java @@ -920,7 +920,7 @@ public class FinancialsAdminBranchOfficeActionWebRequestBean extends BaseFinanci this.updatedBranchOfficeEvent.fire(new AdminBranchOfficeUpdatedEvent(updatedBranchOffice)); // Redirect to list view - return "admin_list_branch_office"; //NOI18N + return "admin_list_branch_offices"; //NOI18N } /** diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java index 1344e290..1bc8c7d4 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java @@ -543,7 +543,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsBean imp this.deletedContactEvent.fire(new AdminDeletedContactEvent(this.getContact())); // Return to list view - return "admin_list_contact"; + return "admin_list_contacts"; } /** diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 622fcd2b..2264dd82 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -85,15 +85,15 @@ /user/user_profile.xhtml - admin_list_fax + admin_list_faxes /admin/fax/admin_fax_list.xhtml - admin_list_landline + admin_list_landlines /admin/landline/admin_landline_list.xhtml - admin_list_mobile + admin_list_mobiles /admin/mobile/admin_mobile_list.xhtml @@ -101,15 +101,15 @@ /admin/country/admin_country_list.xhtml - admin_list_contact + admin_list_contacts /admin/contact/admin_contact_list.xhtml - admin_export_contact + admin_export_contacts /admin/contact/admin_contact_export.xhtml - admin_list_headquarter + admin_list_headquarters /admin/headquarter/admin_headquarter_list.xhtml @@ -117,19 +117,19 @@ /admin/basic_data/admin_basic_data_list.xhtml - admin_list_branch_office + admin_list_branch_offices /admin/branch_office/admin_branch_office_list.xhtml - admin_list_department + admin_list_departments /admin/department/admin_department_list.xhtml - admin_list_opening_time + admin_list_opening_times /admin/opening_time/admin_opening_time_list.xhtml - admin_list_employee + admin_list_employees /admin/employee/admin_employee_list.xhtml @@ -141,11 +141,11 @@ /admin/generic_product/admin_generic_product_list.xhtml - admin_list_user + admin_list_users /admin/user/admin_user_list.xhtml - admin_list_mobile_provider + admin_list_mobile_providers /admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -157,11 +157,11 @@ /admin/country/admin_country_list.xhtml - admin_list_contact + admin_list_contacts /admin/contact/admin_contact_list.xhtml - admin_list_mobile_provider + admin_list_mobile_providers /admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -312,7 +312,7 @@ /admin/user/admin_user_show.xhtml - admin_list_user + admin_list_users /admin/user/admin_user_list.xhtml @@ -545,7 +545,7 @@ /admin/fax_provider/admin_fax_provider_show.xhtml - admin_list_fax + admin_list_faxes /admin/fax/admin_fax_list.xhtml @@ -556,7 +556,7 @@ /admin/landline_provider/admin_landline_provider_show.xhtml - admin_list_landline + admin_list_landlines /admin/landline/admin_landline_list.xhtml @@ -574,7 +574,7 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_list_mobile + admin_list_mobiles /admin/mobile/admin_mobile_list.xhtml @@ -725,7 +725,7 @@ /admin/contact/admin_contact_edit.xhtml - admin_list_contact + admin_list_contacts /admin/contact/admin_contact_list.xhtml @@ -862,7 +862,7 @@ /admin/branch_office/admin_branch_office_edit.xhtml - admin_list_branch_office + admin_list_branch_offices /admin/branch_office/admin_branch_office_list.xhtml diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 348bf4b6..b0740af6 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -16,28 +16,28 @@ - + - - + + - - - - - + + + + + - - - + + + @@ -45,7 +45,7 @@ - +