Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv13875
Modified Files:
PersonHibernateService.java
Log Message:
CMSC-996,User and Group lists in Editors,improve PersonHibernateService in
select not in
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: PersonHibernateService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- PersonHibernateService.java 1 Aug 2008 07:13:53 -0000 1.18
+++ PersonHibernateService.java 4 Aug 2008 08:32:05 -0000 1.19
@@ -17,6 +17,8 @@
import com.finalist.cmsc.services.community.preferences.PreferenceService;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.Authority;
+
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
@@ -32,6 +34,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* @author Remco Bos
@@ -267,18 +270,12 @@
@Transactional(readOnly = true)
public List<Person> getAssociatedPersons(Map conditions) {
-
PagingStatusHolder holder = PagingUtils.getStatusHolder();
-
StringBuffer strb = new StringBuffer();
basicGetAssociatedPersons(conditions, strb);
-
strb.append(holder.getSortToken());
-
Query q = getSession().createQuery(strb.toString());
-
q.setMaxResults(holder.getPageSize()).setFirstResult(holder.getOffset());
-
return q.list();
}
@@ -326,10 +323,15 @@
}
strb.append(")");
}
- else {
+ else if("strict".equals(conditions.get("strict"))){
String groups = conditions.get("group").toString();
strb.append(" and authority.name='" + groups + "'");
}
+ else {
+ String exceptNames=conditions.get("strict").toString();
+ String groupName = conditions.get("group").toString();
+ strb.append(" and authentication.userId not in ('" + exceptNames
+ "')");
+ }
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
