From 3918515e62a106d7f84ad6a3719cb1d7f0b87c56 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 19 Apr 2016 17:45:06 +0200
Subject: [PATCH] added view parameter 'userId' (mostly from URL)

---
 web/admin/user/admin_user_delete.xhtml | 6 ++++++
 web/admin/user/admin_user_edit.xhtml   | 6 ++++++
 web/admin/user/admin_user_unlock.xhtml | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 9396c8b1..176979d0 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,6 +8,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
+	<f:metadata>
+		<f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+	</f:metadata>
+
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
 
@@ -16,6 +20,8 @@
 		</ui:define>
 
 		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+
 			Here goes your content.
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 1e3bf5d9..8c8523be 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -8,6 +8,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
+	<f:metadata>
+		<f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+	</f:metadata>
+
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
 
@@ -16,6 +20,8 @@
 		</ui:define>
 
 		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+
 			Here goes your content.
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 5f45befc..da2dd766 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -8,6 +8,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
+	<f:metadata>
+		<f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+	</f:metadata>
+
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
 
@@ -16,6 +20,8 @@
 		</ui:define>
 
 		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+
 			Here goes your content.
 		</ui:define>
 	</ui:composition>
-- 
2.39.5