Merge pull request #4 from tfroehlich82/master

Fixed example-project for use with Django 1.8

Author: krischer

djangoplugins/fields.py

@@ -8,7 +8,7 @@
 
 
 class PluginField(models.ForeignKey):
-    def __init__(self, point=None, **kwargs):
+    def __init__(self, point=None, *args, **kwargs):
         # Normal path.
         if point is not None:
             kwargs['limit_choices_to'] = {
@@ -18,11 +18,11 @@ def __init__(self, point=None, **kwargs):
         else:
             if "to" in kwargs:
                 del kwargs["to"]
-        super(PluginField, self).__init__(Plugin, **kwargs)
+        super(PluginField, self).__init__(Plugin, *args, **kwargs)
 
 
 class ManyPluginField(models.ManyToManyField):
-    def __init__(self, point=None, **kwargs):
+    def __init__(self, point=None, *args, **kwargs):
         # Normal path.
         if point is not None:
             kwargs['limit_choices_to'] = {
@@ -32,7 +32,7 @@ def __init__(self, point=None, **kwargs):
         else:
             if "to" in kwargs:
                 del kwargs["to"]
-        super(ManyPluginField, self).__init__(Plugin, **kwargs)
+        super(ManyPluginField, self).__init__(Plugin, *args, **kwargs)
 
 
 def get_plugins_qs(point):
@@ -43,7 +43,7 @@ class PluginChoiceField(forms.ModelChoiceField):
     def __init__(self, point, *args, **kwargs):
         kwargs['to_field_name'] = 'name'
         super(PluginChoiceField, self).\
-            __init__(queryset=get_plugins_qs(point), *args, **kwargs)
+            __init__(queryset=get_plugins_qs(point), **kwargs)
 
     def to_python(self, value):
         value = super(PluginChoiceField, self).to_python(value)
@@ -57,16 +57,16 @@ class PluginMultipleChoiceField(forms.ModelMultipleChoiceField):
     def __init__(self, point, *args, **kwargs):
         kwargs['to_field_name'] = 'name'
         super(PluginMultipleChoiceField, self).\
-            __init__(queryset=get_plugins_qs(point), *args, **kwargs)
+            __init__(queryset=get_plugins_qs(point), **kwargs)
 
 
 class PluginModelChoiceField(forms.ModelChoiceField):
     def __init__(self, point, *args, **kwargs):
         super(PluginModelChoiceField, self).\
-            __init__(queryset=get_plugins_qs(point), *args, **kwargs)
+            __init__(queryset=get_plugins_qs(point), **kwargs)
 
 
 class PluginModelMultipleChoiceField(forms.ModelMultipleChoiceField):
     def __init__(self, point, *args, **kwargs):
         super(PluginModelMultipleChoiceField, self).\
-            __init__(queryset=get_plugins_qs(point), *args, **kwargs)
+            __init__(queryset=get_plugins_qs(point), **kwargs)

example-project/mycmsproject/forms.py

@@ -8,3 +8,4 @@
 class ContentForm(forms.ModelForm):
     class Meta:
         model = Content
+        fields = '__all__'

example-project/mycmsproject/settings.py

@@ -2,12 +2,11 @@
 Django settings for mycmsproject project.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
+https://docs.djangoproject.com/en/1.8/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
+https://docs.djangoproject.com/en/1.8/ref/settings/
 """
-from __future__ import absolute_import
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
@@ -23,7 +22,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = []
 
@@ -57,7 +55,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -67,7 +65,7 @@
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
+# https://docs.djangoproject.com/en/1.8/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -81,6 +79,6 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.6/howto/static-files/
+# https://docs.djangoproject.com/en/1.8/howto/static-files/
 
 STATIC_URL = '/static/'

example-project/mycmsproject/urls.py

@@ -1,9 +1,22 @@
+"""
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.8/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Add an import:  from blog import urls as blog_urls
+    2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
+"""
 from __future__ import absolute_import
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url, patterns
 
 from djangoplugins.utils import include_plugins
-
 from .plugins import ContentType
 
 urlpatterns = patterns(

example-project/mycmsproject/views.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from django.http import HttpResponseRedirect
 
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404
@@ -13,10 +14,10 @@ def index(request):
 
 
 def content_list(request, plugin):
-    return render(request, 'content/list.html', dict(
-        plugin=ContentType.get_plugin(plugin),
-        posts=Content.objects.all(),
-    ))
+    return render(request, 'content/list.html', {
+        'plugin': ContentType.get_plugin(plugin),
+        'posts': Content.objects.all(),
+    })
 
 
 def content_create(request, plugin):
@@ -27,18 +28,20 @@ def content_create(request, plugin):
             content = form.save(commit=False)
             content.plugin = plugin.get_model()
             content.save()
-            return content.get_absolute_url()
+            return HttpResponseRedirect(content.get_absolute_url())
+        else:
+            return "[ERROR] from views: {0}".format(form.errors)
     else:
         form = ContentForm()
-    return render(request, 'content/form.html', dict(
-        form=form,
-    ))
+    return render(request, 'content/form.html', {
+        'form': form,
+    })
 
 
 def content_read(request, pk, plugin):
     plugin = ContentType.get_plugin(plugin)
     content = get_object_or_404(Content, pk=pk, plugin=plugin.get_model())
-    return render(request, 'content/read.html', dict(
-        plugin=plugin,
-        content=content,
-    ))
+    return render(request, 'content/read.html', {
+        'plugin': plugin,
+        'content': content,
+    })