Merge branch 'next' into pu

matthiask · matthiask · commit 26be36f88d57 · 2015-08-31T21:09:07.000+02:00
* next: Update contrib.tagging to work with newer django-tagging versions (dev version from https://github.com/Fantomas42/django-tagging) Update jquery to 1.11.3 fixed another W340 occurrence fixed (fields.W340) null has no effect on ManyToManyField.
diff --git a/feincms/contrib/tagging.py b/feincms/contrib/tagging.py
@@ -16,10 +16,13 @@
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
-from tagging import AlreadyRegistered
 from tagging.fields import TagField
 from tagging.models import Tag
 from tagging.utils import parse_tag_input
+try:
+    from tagging.registry import AlreadyRegistered
+except ImportError:
+    from tagging import AlreadyRegistered
 
 
 # ------------------------------------------------------------------------
@@ -109,7 +112,10 @@ def tag_model(cls, admin_cls=None, field_name='tags', sort_tags=False,
     auto_add_admin_field If True, attempts to add the tag field to the admin
                 class.
     """
-    from tagging import register as tagging_register
+    try:
+        from tagging.registry import register as tagging_register
+    except ImportError:
+        from tagging import register as tagging_register
 
     cls.add_to_class(field_name, (
         TagSelectField if select_field else TagField
diff --git a/feincms/module/medialibrary/models.py b/feincms/module/medialibrary/models.py
@@ -103,7 +103,7 @@ class MediaFileBase(models.Model, ExtensionsMixin, TranslatedObjectMixin):
         _("file size"), blank=True, null=True, editable=False)
 
     categories = models.ManyToManyField(
-        Category, verbose_name=_('categories'), blank=True, null=True)
+        Category, verbose_name=_('categories'), blank=True)
     categories.category_filter = True
 
     class Meta:
diff --git a/feincms/module/page/extensions/relatedpages.py b/feincms/module/page/extensions/relatedpages.py
@@ -15,7 +15,6 @@ def handle_model(self):
         self.model.add_to_class('related_pages', models.ManyToManyField(
             settings.FEINCMS_DEFAULT_PAGE_MODEL,
             blank=True,
-            null=True,
             related_name='%(app_label)s_%(class)s_related',
             help_text=_(
                 'Select pages that should be listed as related content.')))
diff --git a/feincms/static/feincms/jquery-1.11.2.min.js b/feincms/static/feincms/jquery-1.11.2.min.js
diff --git a/feincms/static/feincms/jquery-1.11.3.min.js b/feincms/static/feincms/jquery-1.11.3.min.js
diff --git a/feincms/templates/admin/feincms/load-jquery.include b/feincms/templates/admin/feincms/load-jquery.include
@@ -4,7 +4,7 @@ Include jquery, override this template if you want to use a cdn version
 or load more plugins or whatnot
 {% endcomment %}
 
-<script type="text/javascript" src="{% static 'feincms/jquery-1.11.2.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'feincms/jquery-1.11.3.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'feincms/jquery-ui-1.10.3.custom.min.js' %}"></script>
 
 <script type="text/javascript">
