Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen
In directory james.mmbase.org:/tmp/cvs-serv20921/src/nl/leocms/evenementen
Modified Files:
Evenement.java
Log Message:
NMCMS-501
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-501
Index: Evenement.java
===================================================================
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/Evenement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Evenement.java 24 May 2007 11:19:54 -0000 1.11
+++ Evenement.java 29 Apr 2008 12:07:04 -0000 1.12
@@ -34,7 +34,7 @@
* Evenement
*
* @author Henk Hangyi
- * @version $Revision: 1.11 $, $Date: 2007/05/24 11:19:54 $
+ * @version $Revision: 1.12 $, $Date: 2008/04/29 12:07:04 $
*
*/
@@ -239,8 +239,8 @@
String nextChild = thisParent;
String sChildConstraint =
" (( evenement2.dagomschrijving LIKE '' AND evenement2.begindatum > "
+ now + ") "
- + " OR ( evenement2.dagomschrijving NOT LIKE '' AND
evenement2.einddatum > " + now + ") "
- + " AND ( evenement.isspare!='true') AND (
evenement.isoninternet='true' )";
+ + " OR ( evenement2.dagomschrijving NOT LIKE '' AND
evenement2.einddatum > " + now + ")) "
+ + " AND ( evenement2.isspare!='true') AND (
evenement2.isoninternet='true' )";
Cloud cloud = CloudFactory.getCloud();
NodeList cl = cloud.getList(thisParent,
"evenement,partrel,evenement2",
"evenement.begindatum,evenement2.number,evenement2.begindatum",
sChildConstraint,
@@ -431,6 +431,11 @@
public static boolean subscriptionClosed(Node parentEvent, Node childEvent)
{
boolean subscriptionClosed = true;
+ // the subscription is always open if the option "geen sluitingstijd"
has been set
+ if (parentEvent.getIntValue("reageer") == 0) {
+ return false;
+ }
+
// subscription is not used for multiple day events
DoubleDateNode ddn = new DoubleDateNode(childEvent);
Calendar cal = Calendar.getInstance();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
