Continued a bit: (please cherry-pick)

[jjobs-war.git] / web / admin / user / admin_user_show.xhtml

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 1476295a4d8dc2daecd47d114f0167aa419d7cf5..646e9f6b7f7eb7e08640cdb18d22ebc2bc4b8883 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -36,11 +36,13 @@
                                        <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_USER_NAME}" />
+                               <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                       <h:column>
+                                               <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
 
-                                       <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.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_USER_CREATED}" />
@@ -142,6 +144,12 @@
                                        <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
                                </h:column>
 
+                               <h:column>
+                                       <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+                                       <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
+                               </h:column>
+
                                <h:column>
                                        <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
@@ -172,9 +180,7 @@
                        </h:panelGrid>
 
                        <div>
-                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-                                       <ui:param name="user" value="#{beanHelper.user}" />
-                               </ui:include>
+                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
                        </div>
 
                        <div>