-
+
+
+
+
+ : " class="btn btn-default">
+
+
+ : " class="btn btn-default">
+ : " class="btn btn-default">
+
+
+
+
+
@@ -76,18 +76,18 @@
-
-
" onclick="javascript:document.location='
admin/userorg.do?orgId=
'" />
-
-
-
-
- " onclick="javascript:document.location='admin/user/edit.do?orgId='" />
-
-
+
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
- |
- |
- |
- |
- |
-
-
-
-
-
- |
-
- |
-
-
- |
-
-
- |
-
-
-
- role.
-
-
- |
-
-
- " href="admin/userroles.do?userId=&orgId=">
-
-
-
- " href="admin/user/edit.do?userId=&orgId=" id="userEdit${userManageBean.userId}">
-
-
-
- " href="admin/user/remove.do?userId=&orgId=">
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+ ">
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ role.
+
+
+ |
+
+
+ " href="admin/userroles.do?userId=&orgId=">
+
+
+
+ " href="admin/user/edit.do?userId=&orgId=" id="userEdit${userManageBean.userId}">
+
+
+
+ " href="admin/user/remove.do?userId=&orgId=">
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserManageBean.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r77535c74e858f8981aabd0ab219976bcc6e43037
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserManageBean.java (.../UserManageBean.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserManageBean.java (.../UserManageBean.java) (revision 77535c74e858f8981aabd0ab219976bcc6e43037)
@@ -21,37 +21,28 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.usermanagement.dto;
+import org.lamsfoundation.lams.usermanagement.Role;
+
import java.util.ArrayList;
import java.util.List;
-import org.lamsfoundation.lams.usermanagement.Role;
-
/**
* @author Jun-Dir Liew
*
- * Created at 13:34:33 on 9/06/2006
+ * Created at 13:34:33 on 9/06/2006
*/
public class UserManageBean implements Comparable {
- /**
- * UserManageBean Constructor
- *
- * @param
- */
- public UserManageBean() {
- super();
-
- }
-
private Integer userId;
private String login;
+ private String email;
private String title;
private String firstName;
private String lastName;
- private List
roles = new ArrayList();;
+ private List roles = new ArrayList();
+ ;
public Integer getUserId() {
return this.userId;
@@ -69,6 +60,14 @@
this.login = login;
}
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
public String getTitle() {
return this.title;
}
@@ -115,4 +114,4 @@
return login.compareTo(u.getLogin());
}
-}
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r245131a647fbf7add783dd2fc9c9bf82322530a9 -r77535c74e858f8981aabd0ab219976bcc6e43037
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 245131a647fbf7add783dd2fc9c9bf82322530a9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 77535c74e858f8981aabd0ab219976bcc6e43037)
@@ -586,22 +586,23 @@
@Override
@SuppressWarnings("unchecked")
public List getUserManageBeans(Integer orgId) {
- String query = "select u.userId,u.login,u.title,u.firstName,u.lastName, r "
+ String query = "select u.userId,u.login,u.email,u.title,u.firstName,u.lastName, r "
+ "from User u left join u.userOrganisations as uo left join uo.userOrganisationRoles as uor left join uor.role as r where uo.organisation.organisationId=?";
List list = baseDAO.find(query, orgId);
Map beansMap = new HashMap<>();
for (int i = 0; i < list.size(); i++) {
Object[] data = (Object[]) list.get(i);
if (beansMap.containsKey(data[0])) {
- beansMap.get(data[0]).getRoles().add((Role) data[5]);
+ beansMap.get(data[0]).getRoles().add((Role) data[6]);
} else {
UserManageBean bean = new UserManageBean();
bean.setUserId((Integer) data[0]);
bean.setLogin((String) data[1]);
- bean.setTitle((String) data[2]);
- bean.setFirstName((String) data[3]);
- bean.setLastName((String) data[4]);
- bean.getRoles().add((Role) data[5]);
+ bean.setEmail((String) data[2]);
+ bean.setTitle((String) data[3]);
+ bean.setFirstName((String) data[4]);
+ bean.setLastName((String) data[5]);
+ bean.getRoles().add((Role) data[6]);
beansMap.put((Integer) data[0], bean);
}
}