Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java,v
diff -u -r1.3 -r1.4
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	19 Jun 2006 05:38:52 -0000	1.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	23 Jun 2006 07:52:42 -0000	1.4
@@ -120,6 +120,7 @@
 			User user = (User)users.get(i);
 			UserManageBean userManageBean = new UserManageBean();
 			BeanUtils.copyProperties(userManageBean, user);
+			userManageBean.setRoles(service.getRolesForUserByOrganisation(user, orgId));
 			userManageBeans.add(userManageBean);
 		}
 		
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/Attic/UserManageBean.java,v
diff -u -r1.2 -r1.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java	16 Jun 2006 06:58:36 -0000	1.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java	23 Jun 2006 07:52:41 -0000	1.3
@@ -24,6 +24,8 @@
 /* $Id$ */
 package org.lamsfoundation.lams.admin.web;
 
+import java.util.List;
+
 /**
  * @author Jun-Dir Liew
  *
@@ -45,6 +47,7 @@
     private String title;
     private String firstName;
     private String lastName;
+    private List roles;
     
     public Integer getUserId() {
     	return this.userId;
@@ -85,4 +88,12 @@
     public void setLastName(String lastName) {
     	this.lastName = lastName;
     }
+    
+    public List getRoles(){
+    	return this.roles;
+    }
+    
+    public void setRoles(List roles){
+    	this.roles = roles;
+    }
 }
Index: lams_admin/web/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_admin/web/userlist.jsp	23 Jun 2006 06:58:44 -0000	1.4
+++ lams_admin/web/userlist.jsp	23 Jun 2006 07:52:42 -0000	1.5
@@ -17,6 +17,7 @@
 	<th><fmt:message key="admin.user.title"/></th>
 	<th><fmt:message key="admin.user.first_name"/></th>
 	<th><fmt:message key="admin.user.last_name"/></th>
+	<th>Roles</th>
 	<th></th>
 </tr>
 <logic:iterate id="userManageBean" name="UserManageForm" property="userManageBeans">
@@ -37,6 +38,13 @@
 			<bean:write name="userManageBean" property="lastName" />
 		</td>
 		<td>
+		    <small>
+		    <logic:iterate id="role" name="userManageBean" property="roles">
+		        <c:out value="${role.name}" />&nbsp;
+		    </logic:iterate>
+		    </small>
+		</td>
+		<td>
 				<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.edit"/></a>
 				&nbsp;
 				<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.remove"/></a>