Please cherry-pick:

- "list" views may list more than one entity and should be plural

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 8189f407f54265a358cb8e1d71b4664af3d12271..bdb0bd792f739c8273bc689cc98938af24912728 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -74,8 +74,6 @@ javac.classpath=\
     ${file.reference.jcontacts-business-lib.jar}:\
     ${file.reference.jcustomer-core.jar}:\
     ${file.reference.jcustomer-lib.jar}:\
-    ${file.reference.jproduct-core.jar}:\
-    ${file.reference.jproduct-lib.jar}:\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jphone-lib.jar}:\
     ${file.reference.juser-core.jar}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 95a6f25ec982342161d2d19c5936369a4cd0d19c..596e47ec9a3334ea47dc4818be1d455bd3260b75 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -33,12 +33,6 @@
                 <library dirs="200">
                     <file>${file.reference.jcustomer-lib.jar}</file>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.jproduct-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jproduct-lib.jar}</file>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.jphone-core.jar}</file>
                 </library>

diff --git a/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java
index d912a3fb5ecddaadd7bcdb8c43e556b237cc2a32..4cf4d0beaf6182ba2f5fb4c69193bf9a6699f0c3 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java
@@ -920,7 +920,7 @@ public class JobsAdminBranchOfficeActionWebRequestBean extends BaseJobsBean impl
                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/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
index 8bb3fdb8ef1de09c6703349830e4fd1f312a492c..c07195e8f07ab2e2373d79deddf71df41a20d55b 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
@@ -549,7 +549,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                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 84e09fa3a9be7c0b3cac680450f1274483dc21f5..51b054015904ce744cd3b92ae1135597251e77a3 100644 (file)
--- 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,27 +117,26 @@
                        <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>
-                       <from-outcome>admin_list_user</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>
@@ -149,11 +148,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>
@@ -292,7 +291,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>
@@ -525,7 +524,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>
@@ -536,7 +535,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>
@@ -554,7 +553,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>
@@ -705,7 +704,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>
@@ -842,7 +841,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 348bf4b68a4b474594b99531b3d046d48b6434e6..b0740af66ba265b86e78009f68c9547a6c95fb55 100644 (file)
--- 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">