From 363f594ea14a494a01383efb007242f4e427ba4e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 11 May 2020 04:00:31 +0200
Subject: [PATCH] Please cherry-pick: - "list" views may list more than one
entity and should be plural
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
...AdminBranchOfficeActionWebRequestBean.java | 2 +-
.../FinancialsAdminContactWebRequestBean.java | 2 +-
web/WEB-INF/faces-config.xml | 40 +++++++++----------
web/WEB-INF/templates/admin/admin_menu.tpl | 24 +++++------
4 files changed, 34 insertions(+), 34 deletions(-)
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 @@
<to-view-id>/user/user_profile.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_fax</from-outcome>
+ <from-outcome>admin_list_faxes</from-outcome>
<to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_landline</from-outcome>
+ <from-outcome>admin_list_landlines</from-outcome>
<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_mobile</from-outcome>
+ <from-outcome>admin_list_mobiles</from-outcome>
<to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
@@ -101,15 +101,15 @@
<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_contact</from-outcome>
+ <from-outcome>admin_list_contacts</from-outcome>
<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_export_contact</from-outcome>
+ <from-outcome>admin_export_contacts</from-outcome>
<to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_headquarter</from-outcome>
+ <from-outcome>admin_list_headquarters</from-outcome>
<to-view-id>/admin/headquarter/admin_headquarter_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
@@ -117,19 +117,19 @@
<to-view-id>/admin/basic_data/admin_basic_data_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_branch_office</from-outcome>
+ <from-outcome>admin_list_branch_offices</from-outcome>
<to-view-id>/admin/branch_office/admin_branch_office_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_department</from-outcome>
+ <from-outcome>admin_list_departments</from-outcome>
<to-view-id>/admin/department/admin_department_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_opening_time</from-outcome>
+ <from-outcome>admin_list_opening_times</from-outcome>
<to-view-id>/admin/opening_time/admin_opening_time_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_employee</from-outcome>
+ <from-outcome>admin_list_employees</from-outcome>
<to-view-id>/admin/employee/admin_employee_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
@@ -141,11 +141,11 @@
<to-view-id>/admin/generic_product/admin_generic_product_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_user</from-outcome>
+ <from-outcome>admin_list_users</from-outcome>
<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_mobile_provider</from-outcome>
+ <from-outcome>admin_list_mobile_providers</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
@@ -157,11 +157,11 @@
<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_contact</from-outcome>
+ <from-outcome>admin_list_contacts</from-outcome>
<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_mobile_provider</from-outcome>
+ <from-outcome>admin_list_mobile_providers</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
@@ -312,7 +312,7 @@
<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_user</from-outcome>
+ <from-outcome>admin_list_users</from-outcome>
<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -545,7 +545,7 @@
<to-view-id>/admin/fax_provider/admin_fax_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_fax</from-outcome>
+ <from-outcome>admin_list_faxes</from-outcome>
<to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -556,7 +556,7 @@
<to-view-id>/admin/landline_provider/admin_landline_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_landline</from-outcome>
+ <from-outcome>admin_list_landlines</from-outcome>
<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -574,7 +574,7 @@
<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_mobile</from-outcome>
+ <from-outcome>admin_list_mobiles</from-outcome>
<to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -725,7 +725,7 @@
<navigation-rule>
<from-view-id>/admin/contact/admin_contact_edit.xhtml</from-view-id>
<navigation-case>
- <from-outcome>admin_list_contact</from-outcome>
+ <from-outcome>admin_list_contacts</from-outcome>
<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -862,7 +862,7 @@
<navigation-rule>
<from-view-id>/admin/branch_office/admin_branch_office_edit.xhtml</from-view-id>
<navigation-case>
- <from-outcome>admin_list_branch_office</from-outcome>
+ <from-outcome>admin_list_branch_offices</from-outcome>
<to-view-id>/admin/branch_office/admin_branch_office_list.xhtml</to-view-id>
<redirect></redirect>
</navigation-case>
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 @@
<ui:include src="/WEB-INF/templates/admin/menu/project.tpl" />
<p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}" expanded="false">
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.ADMIN_LINK_LIST_USER}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_USER_TITLE}" outcome="admin_list_users" value="#{msg.ADMIN_LINK_LIST_USER}" />
<p:menuitem title="#{msg.ADMIN_LINK_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.ADMIN_LINK_EXPORT_USER}" />
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_CONTACT_TITLE}" expanded="false">
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.ADMIN_LINK_LIST_CONTACT}" />
- <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.ADMIN_LINK_EXPORT_CONTACT}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_CONTACT_TITLE}" outcome="admin_list_contacts" value="#{msg.ADMIN_LINK_LIST_CONTACT}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_CONTACT_TITLE}" outcome="admin_export_contacts" value="#{msg.ADMIN_LINK_EXPORT_CONTACT}" />
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACT_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_data')}" expanded="false">
<p:menuitem title="#{msg.ADMIN_LINK_LIST_BASIC_DATA_TITLE}" outcome="admin_list_basic_data" value="#{msg.ADMIN_LINK_LIST_BASIC_DATA}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_HEADQUARTER_TITLE}" outcome="admin_list_headquarter" value="#{msg.ADMIN_LINK_LIST_HEADQUARTER}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_office" value="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_DEPARTMENTS_TITLE}" outcome="admin_list_department" value="#{msg.ADMIN_LINK_LIST_DEPARTMENTS}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_OPENING_TIMES_TITLE}" outcome="admin_list_opening_time" value="#{msg.ADMIN_LINK_LIST_OPENING_TIMES}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_EMPLOYEES_TITLE}" outcome="admin_list_company_employee" value="#{msg.ADMIN_LINK_LIST_EMPLOYEES}" rendered="#{featureController.isFeatureEnabled('company_employee')}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_HEADQUARTER_TITLE}" outcome="admin_list_headquarters" value="#{msg.ADMIN_LINK_LIST_HEADQUARTER}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_DEPARTMENTS_TITLE}" outcome="admin_list_departments" value="#{msg.ADMIN_LINK_LIST_DEPARTMENTS}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_OPENING_TIMES_TITLE}" outcome="admin_list_opening_times" value="#{msg.ADMIN_LINK_LIST_OPENING_TIMES}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_EMPLOYEES_TITLE}" outcome="admin_list_employees" value="#{msg.ADMIN_LINK_LIST_EMPLOYEES}" rendered="#{featureController.isFeatureEnabled('company_employee')}" />
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}" expanded="false">
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS}" />
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landlines" value="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobiles" value="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_faxes" value="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS}" />
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}" expanded="false">
@@ -45,7 +45,7 @@
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" expanded="false">
- <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER}" />
+ <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_providers" value="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER}" />
</p:submenu>
<p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}" expanded="false">
--
2.39.5