django 1.9 compatability updates

andrewebdev · Apr 12, 2016 · 7ab783b · 7ab783b
1 parent 0971216
commit 7ab783b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/demo/website/forms.py b/demo/website/forms.py
@@ -30,24 +30,29 @@ class HomePageForm(forms.ModelForm):
 
     class Meta:
         model = HomePage
+        fields = ('content',)
 
 
 class GenericPageForm(forms.ModelForm):
     content = forms.CharField(widget=TinyMCE())
 
     class Meta:
         model = GenericPage
+        fields = ('content',)
 
 
 class CasteStudyPageForm(forms.ModelForm):
     content = forms.CharField(widget=TinyMCE())
 
     class Meta:
         model = CaseStudyPage
+        fields = ('content',)
 
 
 class ContactPageForm(forms.ModelForm):
     content = forms.CharField(widget=TinyMCE())
 
     class Meta:
         model = ContactPage
+        fields = ('content',)
+
diff --git a/demo/website/models.py b/demo/website/models.py
@@ -85,3 +85,4 @@ def get_next_url(self):
 
     def get_recipients(self):
         return [i for i in self.recipients.replace(' ', '').split(',')]
+
diff --git a/ostinato/pages/templates/admin/pages_actions.html b/ostinato/pages/templates/admin/pages_actions.html
@@ -1,8 +1,7 @@
 {% load staticfiles %}
-{% load url from future %}
 
 <span id="_page_{{ obj.id }}">
-    
+
     <a class="ostinato_page_move"
         href="#"
         title="move page"><img src="{% static 'pages/img/move.png' %}" /></a>
@@ -24,7 +23,7 @@
         title="as descendant"><img src="{% static 'pages/img/as_child.png' %}" /></a>
 
     <a class="ostinato_new_child"
-        href="{% url 'admin:pages_page_add' %}?parent={{ obj.id }}"
+        href="{% url 'admin:ostinato_pages_page_add' %}?parent={{ obj.id }}"
         title="new page below"><img src="{% static 'pages/img/new_child.png' %}" /></a>
 
     <a class="ostinato_cancel_move"

diff --git a/ostinato/pages/templates/admin/pages_change_list.html b/ostinato/pages/templates/admin/pages_change_list.html
@@ -1,6 +1,5 @@
 {% extends "admin/change_list.html" %}
 {% load admin_list i18n %}
-{% load url from future %}
 
 
 {% block extrahead %}