Fixed old combined un/lock user stuff as this is now separated (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 52f447d32b3c745aee7c238236fc1114bc6b6ec2..ca7e8ddaf5342162ed3ce9f27ae94b758e2bb5f3 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -36,7 +36,7 @@
                                        <h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />
                                </h:column>
 
-                               <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                        <h:column>
                                                <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
 
@@ -180,16 +180,11 @@
                        </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>
-                               <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>
+                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl" />
                        </div>
                </ui:define>
        </ui:composition>