From 741ff7ca29b54b9994ec77d187b03f8cd4dab1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 18 Dec 2009 10:50:40 +0100
Subject: [PATCH] ItEr39S10CUAltaUsuario: list of roles associated to the user
 in the user edition page

Roles are just listed, they can't be added or deleted yet.
---
 .../java/org/navalplanner/web/users/IUserModel.java   |  8 ++++++++
 .../navalplanner/web/users/UserCRUDController.java    |  5 +++++
 .../java/org/navalplanner/web/users/UserModel.java    | 10 ++++++++++
 .../src/main/webapp/users/_editUser.zul               | 11 +++++++++++
 4 files changed, 34 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java
index 07a38c2f8..2f37a0d1a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.entities.User;
+import org.navalplanner.business.users.entities.UserRole;
 
 /**
  * Model for UI operations related to {@link User}
@@ -67,4 +68,11 @@ public interface IUserModel {
      */
     void confirmSave() throws ValidationException;
 
+    /**
+     * Retrieves the list of UserRoles associated with the current User.
+     *
+     * @return List of {@link UserRole} objects.
+     */
+    List<UserRole> getRoles();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
index 2470c4dfa..2c37958af 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
@@ -26,6 +26,7 @@ import java.util.List;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.entities.User;
+import org.navalplanner.business.users.entities.UserRole;
 import org.navalplanner.web.common.ConstraintChecker;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
@@ -124,6 +125,10 @@ public class UserCRUDController extends GenericForwardComposer implements
         return userModel.getUser();
     }
 
+    public List<UserRole> getRoles() {
+        return userModel.getRoles();
+    }
+
     private OnlyOneVisible getVisibility() {
         return (visibility == null) ? new OnlyOneVisible(createWindow,
                 listWindow)
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 4d1784b8c..29cb2c7c4 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
@@ -20,6 +20,7 @@
 
 package org.navalplanner.web.users;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.Validate;
@@ -108,4 +109,13 @@ public class UserModel implements IUserModel {
             each.getProfileName();
         }
     }
+
+    @Override
+    public List<UserRole> getRoles() {
+        List<UserRole> list = new ArrayList<UserRole>();
+        if (user != null) {
+            list.addAll(user.getRoles());
+        }
+        return list;
+    }
 }
diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
index c8bea15c1..ec976900c 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
@@ -53,6 +53,17 @@
                             </row>
                         </rows>
                     </grid>
+                    <!-- Associated UserRoles -->
+                    <grid id="listing" model="@{controller.roles}">
+                        <columns sizable="true">
+                            <column label="${i18n:_('Role name')}" />
+                        </columns>
+                        <rows>
+                            <row self="@{each='role'}" value="@{role}">
+                                <label value="@{role.displayName}" />
+                            </row>
+                        </rows>
+                    </grid>
                 </vbox>
             </tabpanel>
         </tabpanels>