From ebbafa7fc71d544016379abc3b708216c33c61e0 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 5 May 2016 15:59:32 +0200
Subject: [PATCH] fixed controller usage (cherry-pick this!)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland HÃ¤der <roland@mxchange.org>
---
 web/user/user_list.xhtml | 78 ++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml
index ef70326c..64b21a7c 100644
--- a/web/user/user_list.xhtml
+++ b/web/user/user_list.xhtml
@@ -1,39 +1,39 @@
-<?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">
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_LIST}
-		</ui:define>
-
-		<ui:define name="content">
-			<div class="table_big">
-				<div class="table_header">
-					#{msg.TABLE_HEADER_USER_LIST}
-				</div>
-
-				<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
-					<h:column>
-						<f:facet name="header">#{msg.USER_NAME}</f:facet>
-						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-							<ui:param name="user" value="#{user}" />
-						</ui:include>
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.USER_CREATED}</f:facet>
-						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-					</h:column>
-				</h:dataTable>
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
+<?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">
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_USER_LIST}
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="table_big">
+				<div class="table_header">
+					#{msg.TABLE_HEADER_USER_LIST}
+				</div>
+
+				<h:dataTable id="userList" var="user" value="#{adminUserController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{adminUserController.isVisibleUserFound()}">
+					<h:column>
+						<f:facet name="header">#{msg.USER_NAME}</f:facet>
+						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
+							<ui:param name="user" value="#{user}" />
+						</ui:include>
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.USER_CREATED}</f:facet>
+						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+					</h:column>
+				</h:dataTable>
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>
-- 
2.39.5

