Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.48 -r1.49
--- lams_admin/conf/language/ApplicationResources.properties	23 Nov 2006 05:06:17 -0000	1.48
+++ lams_admin/conf/language/ApplicationResources.properties	24 Nov 2006 02:09:34 -0000	1.49
@@ -197,5 +197,6 @@
 msg.group.organisation_id = The organisation_id of this group is
 msg.subgroup.organisation_id = The organisation_id of this subgroup is
 msg.remove.from.subgroups = Removed users will also be removed from subgroups.
+label.global.roles = Global roles
 
 #======= End labels: Exported 188 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.40 -r1.41
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	8 Nov 2006 22:51:31 -0000	1.40
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	24 Nov 2006 02:09:34 -0000	1.41
@@ -127,6 +127,7 @@
 			userForm.set("localeId", locale.getLocaleId());
 			// set user's organisations to display
 			request.setAttribute("userOrgRoles", getUserOrgRoles(user));
+			request.setAttribute("globalRoles", getGlobalRoles(user));
 		} else {  // create a user
 			try {
 				String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
@@ -154,6 +155,20 @@
 		return mapping.findForward("user");
 	}
 	
+	// display user's global roles, if any
+	private UserOrgRoleDTO getGlobalRoles(User user) {
+		UserOrganisation uo = service.getUserOrganisation(user.getUserId(),
+				service.getRootOrganisation().getOrganisationId());
+		UserOrgRoleDTO uorDTO = new UserOrgRoleDTO();
+		List<String> roles = new ArrayList<String>();
+		for (Object uor : uo.getUserOrganisationRoles())
+			roles.add(((UserOrganisationRole)uor).getRole().getName());
+		Collections.sort(roles);
+		uorDTO.setOrgName(uo.getOrganisation().getName());
+		uorDTO.setRoles(roles);
+		return uorDTO;
+	}
+	
 	// display user's organisations and roles in them
 	private List<UserOrgRoleDTO> getUserOrgRoles(User user) {
 		
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.21 -r1.22
--- lams_admin/web/user.jsp	24 Nov 2006 01:47:30 -0000	1.21
+++ lams_admin/web/user.jsp	24 Nov 2006 02:09:34 -0000	1.22
@@ -128,42 +128,67 @@
 			</table>
 			</td>
 
-			<c:if test="${not empty userOrgRoles}">
-				<td>
-					<table class="alternative-color" cellspacing="0">
-						<tr>
-							<th><fmt:message key="label.member.of"/>:</th>
-							<th><fmt:message key="label.with.roles"/>:</th>
-						</tr>
-						<c:forEach var="userOrgRole" items="${userOrgRoles}">
+			<td>
+				<table>
+				
+				<c:if test="${not empty globalRoles}">
+					<tr><td>
+						<table class="alternative-color" cellspacing="0">
 							<tr>
-								<td><c:out value="${userOrgRole.orgName}"/></td>
+								<th><fmt:message key="label.global.roles"/>:</th>
+							</tr>
+							<tr>
 								<td>
 									<small>
-									<c:forEach var="role" items="${userOrgRole.roles}">
+									<c:forEach var="role" items="${globalRoles.roles}">
 										<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
 									</c:forEach>
 									</small>
 								</td>
 							</tr>
-							<c:if test="${not empty userOrgRole.childDTOs}">
-								<c:forEach var="child" items="${userOrgRole.childDTOs}">
-									<tr>
-										<td>-- <c:out value="${child.orgName}"/></td>
-										<td>
-											<small>
-											<c:forEach var="role" items="${child.roles}">
-												<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
-											</c:forEach>
-											</small>
-										</td>
-									</tr>
-								</c:forEach>
-							</c:if>
-						</c:forEach>
-					</table>
-				</td>
-			</c:if>
+						</table>
+					</td></tr>
+				</c:if>
+
+				<c:if test="${not empty userOrgRoles}">
+					<tr><td>
+						<table class="alternative-color" cellspacing="0">
+							<tr>
+								<th><fmt:message key="label.member.of"/>:</th>
+								<th><fmt:message key="label.with.roles"/>:</th>
+							</tr>
+							<c:forEach var="userOrgRole" items="${userOrgRoles}">
+								<tr>
+									<td><c:out value="${userOrgRole.orgName}"/></td>
+									<td>
+										<small>
+										<c:forEach var="role" items="${userOrgRole.roles}">
+											<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
+										</c:forEach>
+										</small>
+									</td>
+								</tr>
+								<c:if test="${not empty userOrgRole.childDTOs}">
+									<c:forEach var="child" items="${userOrgRole.childDTOs}">
+										<tr>
+											<td>-- <c:out value="${child.orgName}"/></td>
+											<td>
+												<small>
+												<c:forEach var="role" items="${child.roles}">
+													<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
+												</c:forEach>
+												</small>
+											</td>
+										</tr>
+									</c:forEach>
+								</c:if>
+							</c:forEach>
+						</table>
+					</td></tr>
+				</c:if>
+				
+				</table>
+			</td>
 	</tr>
 
 </table>