Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv30602
Modified Files:
Tag: MMBase-1_8
Contexts.java
Log Message:
the 'defaultcontext' field on the user builder is optional now
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Contexts.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -b -r1.48.2.4 -r1.48.2.5
--- Contexts.java 9 Dec 2008 10:14:09 -0000 1.48.2.4
+++ Contexts.java 9 Dec 2008 11:21:15 -0000 1.48.2.5
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.48.2.4 2008/12/09 10:14:09 michiel Exp $
+ * @version $Id: Contexts.java,v 1.48.2.5 2008/12/09 11:21:15 michiel Exp $
* @see org.mmbase.security.implementation.cloudcontext.Verify
* @see org.mmbase.security.Authorization
*/
@@ -195,6 +195,7 @@
if (builder instanceof Contexts) {
try {
MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+ if (users.hasField("defaultcontext")) {
BasicSearchQuery query = new BasicSearchQuery(true);
Step step = query.addStep(users);
BasicFieldValueConstraint constraint = new
BasicFieldValueConstraint(new BasicStepField(step,
users.getField("defaultcontext")), new Integer(nodeId));
@@ -214,6 +215,7 @@
int count = result.getIntValue("count");
if (count > 0) return false;
+ }
// perhaps should also return false if there are still
nodes with this context?
// this check is not done in editors, but perhaps it
should be bit harder!
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
