Continued a bit:

- fixed navigation rules (user/customer mixture)
- no ADMIN_LIST_CUSTOMER_FIELD, just ADMIN_CUSTOMER_FIELD

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 826374fe415e50deeb0246e2da7b5311e1bfc0b0..b94d0f39f207563f566cf88ca7646103bd7db427 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,62 +2,58 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_customer_show.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/index.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="customer/register.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="item_added.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="index.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/user/admin_customer_edit.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="*" x="2150" y="300" zoom="true"/>
-        <Node id="customer/login.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="customer/register.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="item_added.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="*" x="150" y="300" zoom="true"/>
+        <Node id="customer/login.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="2150" y="150" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="basket.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/user/admin_customer_unlock.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="terms.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_customer_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/user/admin_customer_delete.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="basket.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="exception.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="logout.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="imprint.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="900" y="900" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index dad9d8cc2bc1385c40619ab966c045b4e9d72708..eee240d17e1cc25b92747066667beb06d2b80b4b 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -291,37 +291,37 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/user/admin_customer_list.xhtml</from-view-id>
+               <from-view-id>/admin/customer/admin_customer_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>admin_show_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_show.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_edit_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_edit.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_delete.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_unlock_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_unlock.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_unlock.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/user/admin_customer_show.xhtml</from-view-id>
+               <from-view-id>/admin/customer/admin_customer_show.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>admin_edit_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_edit.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_delete.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_unlock_customer</from-outcome>
-                       <to-view-id>/admin/user/admin_customer_unlock.xhtml</to-view-id>
+                       <to-view-id>/admin/customer/admin_customer_unlock.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>

diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 1b22d862e39fda00e09d8524029f026a3e59e595..6f49bfc30ef087ebb40ad5f0a6ec599c52f2859b 100644 (file)
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -18,7 +18,7 @@
                <ui:define name="content">
                        <h:dataTable id="table_list_customers" var="customer" value="#{customerController.allCustomers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CUSTOMER}" rendered="#{customerController.hasCustomers()}">
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_CUSTOMER_ID}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_ID}</f:facet>
 
                                        <h:link outcome="admin_show_customer" title="#{msg.ADMIN_LINK_SHOW_CUSTOMER_TITLE}" value="#{customer.customerId}">
                                                <f:param name="customerId" value="#{customer.customerId}" />
@@ -26,7 +26,7 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_CUSTOMER_NUMBER}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_NUMBER}</f:facet>
 
                                        <h:outputText value="#{customer.customerNumber}" />
                                </h:column>
@@ -50,13 +50,13 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_CUSTOMER_ACCOUNT_STATUS}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}</f:facet>
 
                                        <h:outputText styleClass="#{customer.customerAccountStatus.styleClass}" value="#{msg[customer.customerAccountStatus.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_CUSTOMER_CREATED}</f:facet>
+                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_CREATED}</f:facet>
 
                                        <h:outputText id="customerCreated" value="#{customer.customerCreated.time}">
                                                <f:convertDateTime for="customerCreated" type="both" timeStyle="short" dateStyle="short" />