java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml | 7 ++--
java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java | 15 ++++++++++
java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 2 -
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 2 -
4 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 4d9b223834304b97f00c70490e32bd068d0f4459
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jan 4 16:23:33 2013 -0500
891681 - added email field to user list csv
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
index dd0acfe..b50dc7e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
@@ -155,7 +155,7 @@ ORDER BY wcd.login_uc
<elaborator params="">
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name, role_names,
last_logged_in, date_completed as change_date, WUPI.first_names as
changed_by_first_name,
- WUPI.last_name as changed_by_last_name, 'disabled' as status
+ WUPI.last_name as changed_by_last_name, 'disabled' as status, WUPI.email
as email
FROM rhnUsersInOrgOverview UIOO, rhnUserInfo UI, rhnWebContactChangeLog WCCL,
web_user_personal_info WUPI
WHERE UIOO.user_id IN (%s)
@@ -176,7 +176,7 @@ SELECT UIOO.user_id as id, user_login, user_first_name,
user_last_name, role_na
<query name="users_in_org_overview" params="">
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name, role_names,
- server_count, server_group_count, last_logged_in,
+ server_count, server_group_count, last_logged_in, WUPI.email as email,
nvl((select
distinct wccs.label
from
@@ -189,9 +189,10 @@ SELECT UIOO.user_id as id, user_login, user_first_name,
user_last_name, role_na
(select max(wccl_exists.date_completed)
from rhnWebContactChangeLog wccl_exists
where wccl.web_contact_id =
wccl_exists.web_contact_id)),'enabled') as status
- FROM rhnUsersInOrgOverview UIOO, rhnUserInfo UI
+ FROM rhnUsersInOrgOverview UIOO, rhnUserInfo UI, web_user_personal_info WUPI
WHERE UIOO.user_id IN (%s)
AND UI.user_id = UIOO.user_id
+ AND UIOO.user_id = WUPI.web_user_id
ORDER BY UPPER(user_login), UIOO.user_id
</query>
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java
index 633f06b..96a9f1b 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java
@@ -41,6 +41,21 @@ public class UserOverview extends BaseDto {
private Date changeDate;
private String changedByFirstName;
private String changedByLastName;
+ private String email;
+
+ /**
+ * @return Returns the email address
+ */
+ public String getEmail() {
+ return email;
+ }
+
+ /**
+ * @param emailIn email to set
+ */
+ public void setEmail(String emailIn) {
+ email = emailIn;
+ }
/**
* @return Returns the changeDate.
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
index ac235ef..341c5b7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
@@ -67,7 +67,7 @@
</rl:list>
<rl:csv dataset="pageList"
name="userList"
- exportColumns="userLogin,userLastName,userFirstName,roleNames,lastLoggedIn"/>
+ exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn"/>
</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
index 029db0e..03ba080 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
@@ -62,7 +62,7 @@
</rl:list>
<rl:csv dataset="pageList"
name="disabledUserList"
- exportColumns="userLogin,userLastName,userFirstName,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/>
+ exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/>
<div align="right">
<hr />