Continued with refacturing:

- added general admin helper for just holding objects
- used that new helper for user instance to have auto-completition back
- updated properties

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

diff --git a/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestController.java b/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestController.java
new file mode 100644 (file)
index 0000000..0e3b01a
--- /dev/null
+++ b/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestController.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2016 Cho-Time GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jratecalc.beans.helper;
+
+import java.io.Serializable;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * An interface for general bean helper
+ * <p>
+ * @author Roland Haeder<roland@mxchange.org>
+ */
+public interface RateCalcAdminWebRequestController extends Serializable {
+
+       /**
+        * Getter for user instance
+        * <p>
+        * @return User instance
+        */
+       User getUser ();
+
+       /**
+        * Setter for user instance
+        * <p>
+        * @param user User instance
+        */
+       void setUser (final User user);
+
+}

diff --git a/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestHelper.java b/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestHelper.java
new file mode 100644 (file)
index 0000000..0f2f8e5
--- /dev/null
+++ b/src/java/org/mxchange/jratecalc/beans/helper/RateCalcAdminWebRequestHelper.java
@@ -0,0 +1,58 @@
+/*\r
+ * Copyright (C) 2016 Cho-Time GmbH\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU Affero General Public License as\r
+ * published by the Free Software Foundation, either version 3 of the\r
+ * License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU Affero General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Affero General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.jratecalc.beans.helper;\r
+\r
+import javax.enterprise.context.RequestScoped;\r
+import javax.inject.Named;\r
+import org.mxchange.jusercore.model.user.User;\r
+\r
+/**\r
+ * A general helper for beans\r
+ * <p>\r
+ * @author Roland Haeder<roland@mxchange.org>\r
+ */\r
+@Named ("adminHelper")\r
+@RequestScoped\r
+public class RateCalcAdminWebRequestHelper implements RateCalcAdminWebRequestController {\r
+\r
+       /**\r
+        * Serial number\r
+        */\r
+       private static final long serialVersionUID = 17_258_793_567_145_701L;\r
+\r
+       /**\r
+        * User instance\r
+        */\r
+       private User user;\r
+\r
+       /**\r
+        * Default constructor\r
+        */\r
+       public RateCalcAdminWebRequestHelper () {\r
+       }\r
+\r
+       @Override\r
+       public User getUser () {\r
+               return this.user;\r
+       }\r
+\r
+       @Override\r
+       public void setUser (final User user) {\r
+               this.user = user;\r
+       }\r
+\r
+}\r

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 176979d07028ff00e253582687157ed9619707b0..0fdcb19947c3ad782deec6f2e934d02d5b8c7027 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -9,7 +9,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewParam name="userId" value="#{adminHelper.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">
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
 
                        Here goes your content.
                </ui:define>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 8c8523be10a9f49d87ebe7a60e9611a6a83f086a..4d3c97fe8aace47a02efc8a6a31bef75e91718f6 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -9,7 +9,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewParam name="userId" value="#{adminHelper.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">
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
 
                        Here goes your content.
                </ui:define>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 2e45ef7344c5235c9530b4de9d2d49511a8ddcc5..f9caa671d849a7dd09b40b60217348b43da8b380 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -1,184 +1,184 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       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_SHOW_USER}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
-
-                       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty user}">
-                               <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-                                               <f:param value="#{user.userName}" />
-                                               <f:param value="#{user.userId}" />
-                                       </h:outputFormat>
-                               </f:facet>
-
-                               <h:column>
-                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
-
-                                       <h:outputText id="userId" styleClass="data_field" value="#{user.userId}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
-
-                                       <h:outputText id="userName" styleClass="data_field" value="#{user.userName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
-
-                                       <h:outputText id="userCreated" styleClass="data_field" value="#{user.userCreated.time}">
-                                               <f:convertDateTime for="userCreated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
-
-                                       <h:outputText id="userUpdated" styleClass="data_field" value="#{user.userUpdated.time}">
-                                               <f:convertDateTime for="userUpdated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
-
-                                       <h:outputText id="userAccountStatus" styleClass="data_field #{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
-
-                                       <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[user.userProfileMode.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
-
-                                       <h:outputText id="userLastLocked" styleClass="data_field" value="#{user.userLastLocked.time}">
-                                               <f:convertDateTime for="userLastLocked" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
-
-                                       <h:outputText id="lastLockedReason" styleClass="data_field" value="#{user.lastLockedReason}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
-
-                                       <h:outputText id="contactCreated" styleClass="data_field" value="#{user.userContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
-
-                                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{user.userContact.contactUpdated.time}">
-                                               <f:convertDateTime for="contactUpdated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
-
-                                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{user.userContact.isOwnContact()}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
-
-                                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[user.userContact.contactGender.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
-
-                                       <h:outputText id="contactTitle" styleClass="data_field" value="#{user.userContact.contactTitle}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
-
-                                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{user.userContact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
-
-                                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{user.userContact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
-
-                                       <h:outputText id="contactStreet" styleClass="data_field" value="#{user.userContact.contactStreet}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
-
-                                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{user.userContact.contactHouseNumber}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
-
-                                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{user.userContact.contactZipCode}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
-
-                                       <h:outputText id="contactCity" styleClass="data_field" value="#{user.userContact.contactCity}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
-
-                                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{user.userContact.contactEmailAddress}">
-                                               <h:outputText value="#{user.userContact.contactEmailAddress}" />
-                                       </h:outputLink>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
-
-                                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{user.userContact.contactBirthday.time}">
-                                               <f:convertDateTime for="contactBirthday" type="date" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:panelGrid>
-
-                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-                               <ui:param name="user" value="#{user}" />
-                       </ui:include>
-
-                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
-                               <ui:param name="cellphoneNumber" value="#{user.userContact.contactCellphoneNumber}" />
-                               <ui:param name="user" value="#{user}" />
-                       </ui:include>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+       >\r
+\r
+       <f:metadata>\r
+               <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />\r
+       </f:metadata>\r
+\r
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_ADMIN_SHOW_USER}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />\r
+\r
+                       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.user}">\r
+                               <f:facet name="header">\r
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">\r
+                                               <f:param value="#{adminHelper.user.userName}" />\r
+                                               <f:param value="#{adminHelper.user.userId}" />\r
+                                       </h:outputFormat>\r
+                               </f:facet>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />\r
+\r
+                                       <h:outputText id="userId" styleClass="data_field" value="#{adminHelper.user.userId}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />\r
+\r
+                                       <h:outputText id="userName" styleClass="data_field" value="#{adminHelper.user.userName}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />\r
+\r
+                                       <h:outputText id="userCreated" styleClass="data_field" value="#{adminHelper.user.userCreated.time}">\r
+                                               <f:convertDateTime for="userCreated" type="both" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />\r
+\r
+                                       <h:outputText id="userUpdated" styleClass="data_field" value="#{adminHelper.user.userUpdated.time}">\r
+                                               <f:convertDateTime for="userUpdated" type="both" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />\r
+\r
+                                       <h:outputText id="userAccountStatus" styleClass="data_field #{adminHelper.user.userAccountStatus.styleClass}" value="#{msg[adminHelper.user.userAccountStatus.messageKey]}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />\r
+\r
+                                       <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[adminHelper.user.userProfileMode.messageKey]}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />\r
+\r
+                                       <h:outputText id="userLastLocked" styleClass="data_field" value="#{adminHelper.user.userLastLocked.time}">\r
+                                               <f:convertDateTime for="userLastLocked" type="both" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />\r
+\r
+                                       <h:outputText id="lastLockedReason" styleClass="data_field" value="#{adminHelper.user.lastLockedReason}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />\r
+\r
+                                       <h:outputText id="contactCreated" styleClass="data_field" value="#{adminHelper.user.userContact.contactCreated.time}">\r
+                                               <f:convertDateTime for="contactCreated" type="both" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />\r
+\r
+                                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{adminHelper.user.userContact.contactUpdated.time}">\r
+                                               <f:convertDateTime for="contactUpdated" type="both" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />\r
+\r
+                                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{adminHelper.user.userContact.isOwnContact()}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />\r
+\r
+                                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminHelper.user.userContact.contactGender.messageKey]}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />\r
+\r
+                                       <h:outputText id="contactTitle" styleClass="data_field" value="#{adminHelper.user.userContact.contactTitle}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />\r
+\r
+                                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{adminHelper.user.userContact.contactFirstName}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />\r
+\r
+                                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminHelper.user.userContact.contactFamilyName}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />\r
+\r
+                                       <h:outputText id="contactStreet" styleClass="data_field" value="#{adminHelper.user.userContact.contactStreet}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />\r
+\r
+                                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminHelper.user.userContact.contactHouseNumber}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />\r
+\r
+                                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{adminHelper.user.userContact.contactZipCode}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />\r
+\r
+                                       <h:outputText id="contactCity" styleClass="data_field" value="#{adminHelper.user.userContact.contactCity}" />\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />\r
+\r
+                                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminHelper.user.userContact.contactEmailAddress}">\r
+                                               <h:outputText value="#{adminHelper.user.userContact.contactEmailAddress}" />\r
+                                       </h:outputLink>\r
+                               </h:column>\r
+\r
+                               <h:column>\r
+                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />\r
+\r
+                                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{adminHelper.user.userContact.contactBirthday.time}">\r
+                                               <f:convertDateTime for="contactBirthday" type="date" />\r
+                                       </h:outputText>\r
+                               </h:column>\r
+                       </h:panelGrid>\r
+\r
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">\r
+                               <ui:param name="user" value="#{adminHelper.user}" />\r
+                       </ui:include>\r
+\r
+                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">\r
+                               <ui:param name="cellphoneNumber" value="#{adminHelper.user.userContact.contactCellphoneNumber}" />\r
+                               <ui:param name="user" value="#{adminHelper.user}" />\r
+                       </ui:include>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index da2dd766efe89e2428861ab06a0f74d86472b0ed..fe96f5512baed7fceab3e970ce1e017cb8e154d7 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -9,7 +9,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewParam name="userId" value="#{adminHelper.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">
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
 
                        Here goes your content.
                </ui:define>