From: Roland Häder Date: Wed, 27 Apr 2016 10:08:33 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f722bc3bfe1ce1df821f83a0156d3247cf2ee2ad;p=pizzaservice-war.git Continued a bit: - fixed navigation rules (user/customer mixture) - no ADMIN_LIST_CUSTOMER_FIELD, just ADMIN_CUSTOMER_FIELD Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 826374fe..b94d0f39 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,62 +2,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index dad9d8cc..eee240d1 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -291,37 +291,37 @@ - /admin/user/admin_customer_list.xhtml + /admin/customer/admin_customer_list.xhtml admin_show_customer - /admin/user/admin_customer_show.xhtml + /admin/customer/admin_customer_show.xhtml admin_edit_customer - /admin/user/admin_customer_edit.xhtml + /admin/customer/admin_customer_edit.xhtml admin_delete_customer - /admin/user/admin_customer_delete.xhtml + /admin/customer/admin_customer_delete.xhtml admin_unlock_customer - /admin/user/admin_customer_unlock.xhtml + /admin/customer/admin_customer_unlock.xhtml - /admin/user/admin_customer_show.xhtml + /admin/customer/admin_customer_show.xhtml admin_edit_customer - /admin/user/admin_customer_edit.xhtml + /admin/customer/admin_customer_edit.xhtml admin_delete_customer - /admin/user/admin_customer_delete.xhtml + /admin/customer/admin_customer_delete.xhtml admin_unlock_customer - /admin/user/admin_customer_unlock.xhtml + /admin/customer/admin_customer_unlock.xhtml diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml index 1b22d862..6f49bfc3 100644 --- a/web/admin/customer/admin_customer_list.xhtml +++ b/web/admin/customer/admin_customer_list.xhtml @@ -18,7 +18,7 @@ - #{msg.ADMIN_LIST_CUSTOMER_ID} + #{msg.ADMIN_CUSTOMER_ID} @@ -26,7 +26,7 @@ - #{msg.ADMIN_LIST_CUSTOMER_NUMBER} + #{msg.ADMIN_CUSTOMER_NUMBER} @@ -50,13 +50,13 @@ - #{msg.ADMIN_LIST_CUSTOMER_ACCOUNT_STATUS} + #{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS} - #{msg.ADMIN_LIST_CUSTOMER_CREATED} + #{msg.ADMIN_CUSTOMER_CREATED}