diff options
| author | Johannes Raggam <raggam-nl@adm.at> | 2011-10-11 12:30:25 (GMT) |
|---|---|---|
| committer | Johannes Raggam <raggam-nl@adm.at> | 2011-10-11 12:30:25 (GMT) |
| commit | a48129a20a177e6f9a81720e83137f682248bfa6 (patch) | |
| tree | db681742189ae696bd7378a035ac0528cd18e298 | |
| parent | a85b355eb60c1f96ab259b246d9534f322bd71f8 (diff) | |
| parent | 8a87cf0a86dbc645afd8a4415526add2c164615f (diff) | |
Merge branch 'master' of github.com:nnrcschmdt/helsinki
| -rw-r--r-- | program/models.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/models.py b/program/models.py index ef3ee0c..89bf8f8 100644 --- a/program/models.py +++ b/program/models.py @@ -182,9 +182,9 @@ class ProgramSlot(models.Model): return u'%s, %s, %s - %s' % (weekday, self.rrule, tstart, tend) def save(self, *args, **kwargs): - if not self.pk: - super(ProgramSlot, self).save(*args, **kwargs) + super(ProgramSlot, self).save(*args, **kwargs) + if not self.pk: if self.rrule.freq == 0: byweekday_start = None byweekday_end = None diff --git a/requirements.txt b/requirements.txt index f22e9ab..6fd9477 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Django==1.2.5 +Django==1.2.7 MySQL-python==1.2.3 PIL==1.1.7 -PyYAML==3.09 +PyYAML==3.10 django-tinymce==1.5.1a2 python-dateutil==1.5 |