From f5d99cdb8261cda897699533d10a89225cfd3ee8 Mon Sep 17 00:00:00 2001
From: Javier Moran Rua <jmoran@igalia.com>
Date: Sun, 19 Aug 2012 14:08:53 +0200
Subject: [PATCH] Does the users list sortable by user type (LDAP or Database).

  * It was also refactored the getUserType() method inside User entity class.
---
 .../libreplan/business/users/entities/User.java |  7 +++++++
 .../libreplan/web/users/UserCRUDController.java | 17 +----------------
 .../src/main/webapp/users/_listUsers.zul        |  3 ++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
index 96e26c4e5..41862785c 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
@@ -21,6 +21,8 @@
 
 package org.libreplan.business.users.entities;
 
+import static org.libreplan.business.i18n.I18nHelper._;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -43,6 +45,7 @@ import org.libreplan.business.users.daos.IUserDAO;
  * @author Cristina Alvarino Perez <cristina.alvarino@comtecsf.es>
  * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
  * @author Manuel Rego Casasnovas <rego@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 public class User extends BaseEntity implements IHumanIdentifiable{
 
@@ -336,4 +339,8 @@ public class User extends BaseEntity implements IHumanIdentifiable{
         return worker != null;
     }
 
+    public String getUserType() {
+        return isLibrePlanUser().equals(Boolean.TRUE) ? _("Database")
+                : _("LDAP");
+    }
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
index 3c442a0e6..b7bf56efb 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
@@ -100,7 +100,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
             Util.appendLabel(row, user.getLoginName());
             Util.appendLabel(row, user.isDisabled() ? _("Yes") : _("No"));
             Util.appendLabel(row, user.isSuperuser() ? _("Yes") : _("No"));
-            Util.appendLabel(row, getAuthenticationType(user));
+            Util.appendLabel(row, _(user.getUserType()));
             Util.appendLabel(row, user.isBound() ? user.getWorker()
                     .getShortDescription() : "");
 
@@ -362,21 +362,6 @@ public class UserCRUDController extends BaseCRUDController<User> implements
         };
     }
 
-    public String getAuthenticationType() {
-        User user = getUser();
-        if (user != null) {
-            return getAuthenticationType(user);
-        }
-        return "";
-    }
-
-    private String getAuthenticationType(User user) {
-        if (user.isLibrePlanUser()) {
-            return _("Database");
-        }
-        return _("LDAP");
-    }
-
     public RowRenderer getUsersRenderer() {
         return usersRenderer;
     }
diff --git a/libreplan-webapp/src/main/webapp/users/_listUsers.zul b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
index 119656edb..dfc42e57c 100644
--- a/libreplan-webapp/src/main/webapp/users/_listUsers.zul
+++ b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
@@ -28,7 +28,8 @@
             sort="auto(lower(loginName))" sortDirection="ascending"/>
             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
             <newdatasortablecolumn label="${i18n:_('Superuser')}" />
-            <newdatasortablecolumn label="${i18n:_('Authentication type')}" />
+            <newdatasortablecolumn label="${i18n:_('Authentication type')}" 
+            sort="auto(userType)"/>
             <newdatasortablecolumn label="${i18n:_('Bound resource')}" />
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>