Fix CSRF and Rules Admin (params field).

schedule/forms.py

@@ -1,14 +1,12 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from schedule.models import Event, Occurrence, Rule
-import datetime
-import time
 
 
 class SpanForm(forms.ModelForm):
 
     start = forms.DateTimeField(widget=forms.SplitDateTimeWidget)
-    end = forms.DateTimeField(widget=forms.SplitDateTimeWidget, help_text = _("The end time must be later than start time."))
+    end = forms.DateTimeField(widget=forms.SplitDateTimeWidget, help_text=_("The end time must be later than start time."))
 
     def clean_end(self):
         if self.cleaned_data['end'] <= self.cleaned_data['start']:
@@ -17,25 +15,24 @@ def clean_end(self):
 
 
 class EventForm(SpanForm):
+    end_recurring_period = forms.DateTimeField(help_text=_("This date is ignored for one time only events."), required=False)
+
     def __init__(self, hour24=False, *args, **kwargs):
         super(EventForm, self).__init__(*args, **kwargs)
-
-    end_recurring_period = forms.DateTimeField(help_text = _("This date is ignored for one time only events."), required=False)
-
+
     class Meta:
         model = Event
         exclude = ('creator', 'created_on', 'calendar')
-        
+
 
 class OccurrenceForm(SpanForm):
-    
+
     class Meta:
         model = Occurrence
         exclude = ('original_start', 'original_end', 'event', 'cancelled')
 
 
 class RuleForm(forms.ModelForm):
-    params = forms.CharField(widget=forms.Textarea, help_text=_("Extra parameters to define this type of recursion. Should follow this format: rruleparam:value;otherparam:value."))
 
     def clean_params(self):
         params = self.cleaned_data["params"]

schedule/models/events.py

@@ -38,7 +38,7 @@ class Meta:
         verbose_name = _('event')
         verbose_name_plural = _('events')
         app_label = 'schedule'
-	get_latest_by = 'start' 
+	get_latest_by = 'start'
 
     def __unicode__(self):
         date_format = u'l, %s' % ugettext("DATE_FORMAT")
@@ -158,7 +158,7 @@ def _occurrences_after_generator(self, after=None):
         difference = self.end - self.start
         while True:
             o_start = date_iter.next()
-            if o_start > self.end_recurring_period:
+            if self.end_recurring_period is not None and o_start > self.end_recurring_period:
                 raise StopIteration
             o_end = o_start + difference
             if o_end > after:
@@ -175,11 +175,11 @@ def occurrences_after(self, after=None):
         while True:
             next = generator.next()
             yield occ_replacer.get_occurrence(next)
-    
+
     def next_occurrence(self):
         for o in self.occurrences_after():
             return o
-    
+
 
 class EventRelationManager(models.Manager):
     '''

schedule/models/rules.py

@@ -1,7 +1,6 @@
 from django.db import models
-from django.utils.translation import ugettext, ugettext_lazy as _
-
 from dateutil import rrule
+from django.utils.translation import ugettext_lazy as _
 
 RRULE_WEEKDAYS = {"MO":0,"TU":1,"WE":2,"TH":3,"FR":4,"SA":5,"SU":6}
 
@@ -45,7 +44,7 @@ class Rule(models.Model):
     name = models.CharField(_("name"), max_length=32)
     description = models.TextField(_("description"))
     frequency = models.CharField(_("frequency"), choices=freqs, max_length=10)
-    params = models.TextField(_("params"), null=True, blank=True)
+    params = models.TextField(_("params"), null=True, blank=True, help_text=_("Extra parameters to define this type of recursion. Should follow this format: rruleparam:value;otherparam:value."))
 
     class Meta:
         verbose_name = _('rule')

schedule/templates/schedule/cancel_occurrence.html

@@ -6,6 +6,7 @@ <h1>{% trans "Delete" %}</h1>
 {% trans "Are you sure that you really want to cancel this occurrence?" %}
 
 <form action="." method="POST">
+    {% csrf_token %}
     <h2>{{ occurrence.title }}</h2>
     <strong>From</strong> {{ occurrence.start|date:_("DATETIME_FORMAT") }}
     <strong>to</strong> {{ occurrence.end|date:_("DATETIME_FORMAT") }} <br/>

schedule/templates/schedule/create_event.html

@@ -5,6 +5,7 @@
 <b>{% trans "Create or change event. All fields are required." %}</b>
 <br/><br/>
 <form action="" method="post">
+{% csrf_token %}
 <table>
 {{ form.as_table }}
 </table>

schedule/templates/schedule/delete_event.html

@@ -6,6 +6,7 @@ <h1>{% trans "Delete" %}</h1>
 {% trans "Are you sure that you really want to delete it?" %}
 
 <form action="." method="POST">
+    {% csrf_token %}
     {{ object }} <br/>
     <input type="submit" value="{% trans "Delete" %}" />
     <input type="button" value="{% trans "Cancel" %}" onclick="window.location='{{next}}'"/>

schedule/templates/schedule/edit_occurrence.html

@@ -5,6 +5,7 @@
 <b>{% trans "Create or change occurrence. All fields are required." %}</b>
 <br/><br/>
 <form action="" method="post">
+{% csrf_token %}
 <table>
 {{ form.as_table }}
 </table>