Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv30665/cloudcontext/builders
Modified Files:
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.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Contexts.java 9 Dec 2008 10:25:35 -0000 1.59
+++ Contexts.java 9 Dec 2008 11:23:00 -0000 1.60
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.59 2008/12/09 10:25:35 michiel Exp $
+ * @version $Id: Contexts.java,v 1.60 2008/12/09 11:23:00 michiel Exp $
* @see org.mmbase.security.implementation.cloudcontext.Verify
* @see org.mmbase.security.Authorization
*/
@@ -194,6 +194,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));
@@ -215,7 +216,7 @@
// 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!
-
+ }
} catch (SearchQueryException sqe) {
// leave to rest of impl.
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
