From 934eaf1b744d58b216f225c57eb27f7ac62a7a49 Mon Sep 17 00:00:00 2001
From: bkfox <thomas bkfox net>
Date: Thu, 24 Nov 2016 15:07:44 +0100
Subject: [PATCH] fix import error with wagtail 1.7

---
 README.md           | 9 +++++++++
 aircox/models.py    | 9 +++++++++
 aircox_cms/utils.py | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index abb1674..278563d 100755
--- a/README.md
+++ b/README.md
@@ -60,6 +60,15 @@ External applications:
 You must write a settings.py file in the `instance` directory (you can just
 copy and paste `instance/sample_settings.py`.
 
+You will need to define a secret key, and eventually update the list of allowed hosts:
+
+```
+# django's project secret key (mandatory; you can find generators online)
+SECRET_KEY = ''
+# list of allowed hosts
+ALLOWED_HOSTS = [ '127.0.0.1:8042' ]
+```
+
 You also want to redefine the following variable (required by Wagtail for the CMS):
 
 ```
diff --git a/aircox/models.py b/aircox/models.py
index 37876bb..92382cf 100755
--- a/aircox/models.py
+++ b/aircox/models.py
@@ -503,6 +503,9 @@ class Schedule(models.Model):
         otherwise.
         If the schedule is ponctual, return None.
         """
+        if self.frequency == Schedule.Frequency.ponctual:
+            return False
+
         # since we care only about the week, go to the same day of the week
         date = date_or_default(date)
         date += tz.timedelta(days = self.date.weekday() - date.weekday() )
@@ -531,6 +534,9 @@ class Schedule(models.Model):
         """
         Return a list with all matching dates of date.month (=today)
         """
+        if self.frequency == Schedule.Frequency.ponctual:
+            return []
+
         date = date_or_default(date, True).replace(day=1)
         freq = self.frequency
 
@@ -580,6 +586,9 @@ class Schedule(models.Model):
 
         If exclude_saved, exclude all diffusions that are yet in the database.
         """
+        if self.frequency == Schedule.Frequency.ponctual:
+            return []
+
         dates = self.dates_of_month(date)
         diffusions = []
 
diff --git a/aircox_cms/utils.py b/aircox_cms/utils.py
index 4c9a474..4558f5a 100755
--- a/aircox_cms/utils.py
+++ b/aircox_cms/utils.py
@@ -1,6 +1,6 @@
 
 from django.core.urlresolvers import reverse
-from wagtail.wagtailimages.utils import generate_signature
+from wagtail.wagtailimages.views.serve import generate_signature, verify_sign   ature
 
 
 def image_url(image, filter_spec):