X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_show.xhtml;h=17df62775096f5425d41564178e036aca820ee94;hb=bb14720058eea45d45f2b1821377849ea6182e42;hp=2e45ef7344c5235c9530b4de9d2d49511a8ddcc5;hpb=841557e087ba76a1e8f09ef5aa3b6f539c1e7ed6;p=addressbook-war.git

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 2e45ef73..17df6277 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -1,4 +1,3 @@
-<?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}"
@@ -9,7 +8,8 @@
 	>
 
 	<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="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyUserToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -20,165 +20,177 @@
 		</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 beanHelper.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}">
+			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
 				<f:facet name="header">
 					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-						<f:param value="#{user.userName}" />
-						<f:param value="#{user.userId}" />
+						<f:param value="#{beanHelper.user.userName}" />
+						<f:param value="#{beanHelper.user.userId}" />
 					</h:outputFormat>
 				</f:facet>
 
 				<h:column>
-					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
+					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
 
-					<h:outputText id="userId" styleClass="data_field" value="#{user.userId}" />
+					<h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />
 				</h:column>
 
-				<h:column>
-					<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
+				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+					<h:column>
+						<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
 
-					<h:outputText id="userName" styleClass="data_field" value="#{user.userName}" />
-				</h:column>
+						<h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />
+					</h:column>
+				</ui:fragment>
 
 				<h:column>
-					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
+					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
 
-					<h:outputText id="userCreated" styleClass="data_field" value="#{user.userCreated.time}">
+					<h:outputText id="userCreated" styleClass="data_field" value="#{beanHelper.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:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-					<h:outputText id="userUpdated" styleClass="data_field" value="#{user.userUpdated.time}">
+					<h:outputText id="userUpdated" styleClass="data_field" value="#{beanHelper.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:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-					<h:outputText id="userAccountStatus" styleClass="data_field #{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+					<h:outputText id="userAccountStatus" styleClass="data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
+					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
-					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[user.userProfileMode.messageKey]}" />
+					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
+					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
-					<h:outputText id="userLastLocked" styleClass="data_field" value="#{user.userLastLocked.time}">
+					<h:outputText id="userLastLocked" styleClass="data_field" value="#{beanHelper.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:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
-					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{user.lastLockedReason}" />
+					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{beanHelper.user.userLastLockedReason}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
+					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
 
-					<h:outputText id="contactCreated" styleClass="data_field" value="#{user.userContact.contactCreated.time}">
+					<h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.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:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
 
-					<h:outputText id="contactUpdated" styleClass="data_field" value="#{user.userContact.contactUpdated.time}">
+					<h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.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:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
-					<h:outputText id="isOwnContact" styleClass="data_field" value="#{user.userContact.isOwnContact()}" />
+					<h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[user.userContact.contactGender.messageKey]}" />
+					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
 
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{user.userContact.contactTitle}" />
+					<h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.user.userContact.contactTitle}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{user.userContact.contactFirstName}" />
+					<h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{user.userContact.contactFamilyName}" />
+					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
+					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
-					<h:outputText id="contactStreet" styleClass="data_field" value="#{user.userContact.contactStreet}" />
+					<h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.user.userContact.contactStreet}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
+					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
-					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{user.userContact.contactHouseNumber}" />
+					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
+					<h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
 
-					<h:outputText id="contactZipCode" styleClass="data_field" value="#{user.userContact.contactZipCode}" />
+					<h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
+					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
-					<h:outputText id="contactCity" styleClass="data_field" value="#{user.userContact.contactCity}" />
+					<h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+					<h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.user.userContact.contactCity}" />
+				</h:column>
 
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{user.userContact.contactEmailAddress}">
-						<h:outputText value="#{user.userContact.contactEmailAddress}" />
+				<h:column>
+					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
+						<h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
 					</h:outputLink>
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
+					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-					<h:outputText id="contactBirthday" styleClass="data_field" value="#{user.userContact.contactBirthday.time}">
+					<h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.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>
+			<div>
+				<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
+					<ui:param name="user" value="#{beanHelper.user}" />
+				</ui:include>
+			</div>
+
+			<div>
+				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
+					<ui:param name="cellphoneNumber" value="#{beanHelper.user.userContact.contactCellphoneNumber}" />
+					<ui:param name="contact" value="#{beanHelper.user.userContact}" />
+				</ui:include>
+			</div>
 		</ui:define>
 	</ui:composition>
 </html>
