svnno****@sourc*****
svnno****@sourc*****
2009年 1月 31日 (土) 05:42:46 JST
Revision: 1705
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1705
Author: shinsuke
Date: 2009-01-31 05:42:46 +0900 (Sat, 31 Jan 2009)
Log Message:
-----------
removed disabled users from a list.
Modified Paths:
--------------
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/SchedulerConstants.java
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java
-------------- next part --------------
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/SchedulerConstants.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/SchedulerConstants.java 2009-01-30 13:31:09 UTC (rev 1704)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/SchedulerConstants.java 2009-01-30 20:42:46 UTC (rev 1705)
@@ -26,4 +26,6 @@
public static final String REPEAT_TYPE_MONTHLY = "MONTHLY";
public static final String REPEAT_TYPE_YEARLY = "YEARLY";
+
+ public static final String USER_DISABLED = "D";
}
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2009-01-30 13:31:09 UTC (rev 1704)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2009-01-30 20:42:46 UTC (rev 1705)
@@ -77,6 +77,9 @@
cb.query().setRoleId_Equal(roleId);
+ cb.query().queryUserInfo().setStatus_NotEqual(
+ SchedulerConstants.USER_DISABLED);
+ cb.query().queryUserInfo().setDeletedBy_IsNull();
cb.query().queryUserInfo().addOrderBy_UserId_Asc();
return roleMappingBhv.selectList(cb);
@@ -90,6 +93,9 @@
cb.query().setGroupId_Equal(groupId);
+ cb.query().queryUserInfo().setStatus_NotEqual(
+ SchedulerConstants.USER_DISABLED);
+ cb.query().queryUserInfo().setDeletedBy_IsNull();
cb.query().queryUserInfo().addOrderBy_UserId_Asc();
return groupMappingBhv.selectList(cb);