From dd5f1d240cd15e0f90ea4a8b0ae6ffbcce933f9c Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Thu, 27 Jan 2011 16:43:05 +0100
Subject: [PATCH] Add information in user list about if the user is
 administrator or not.

FEA : ItEr69S06AutocompleteAndPasswords
---
 .../navalplanner/business/users/entities/User.java  |  4 ++++
 .../java/org/navalplanner/web/users/UserModel.java  | 13 ++++++++++++-
 .../src/main/webapp/users/_listUsers.zul            |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
index 06c4b9e9f..166eb7cec 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
@@ -166,6 +166,10 @@ public class User extends BaseEntity {
         return disabled;
     }
 
+    public boolean isAdministrator() {
+        return isInRole(UserRole.ROLE_ADMINISTRATION);
+    }
+
     @AssertTrue(message="login name is already being used by another user")
     public boolean checkConstraintUniqueLoginName() {
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
index e4d0ceaa3..0925cd458 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
@@ -65,7 +65,18 @@ public class UserModel implements IUserModel {
     @Override
     @Transactional(readOnly=true)
     public List<User> getUsers() {
-        return userDAO.list(User.class);
+        List<User> users = userDAO.list(User.class);
+        initializeUsers(users);
+        return users;
+    }
+
+    private void initializeUsers(List<User> users) {
+        for (User user : users) {
+            user.getRoles().size();
+            for (Profile profile : user.getProfiles()) {
+                profile.getRoles().size();
+            }
+        }
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
index 2d0e2df40..59861dc26 100644
--- a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
@@ -25,12 +25,14 @@
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
+            <newdatasortablecolumn label="${i18n:_('Is administrator')}" />
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
             <row self="@{each='user'}" value="@{user}">
                 <label value="@{user.loginName}" />
                 <checkbox checked="@{user.disabled}" disabled="true" />
+                <checkbox checked="@{user.administrator}" disabled="true" />
                 <hbox>
                     <button sclass="icono" image="/common/img/ico_editar1.png"
                         hoverImage="/common/img/ico_editar.png"