Merge remote-tracking branch 'upstream/support/3.0.x' into c

Conflicts:
	CHANGELOG.txt
	cms/admin/change_list.py
	cms/cms_toolbar.py
	cms/menu.py
	cms/templatetags/cms_tags.py
	cms/test_utils/project/sampleapp/menu.py
	cms/test_utils/project/sampleapp/urls.py
	cms/test_utils/project/sampleapp/views.py
	cms/tests/apphooks.py
	cms/tests/menu.py
	cms/tests/multilingual.py
	cms/tests/placeholder.py
	cms/tests/toolbar.py
	cms/utils/plugins.py
	menus/menu_pool.py
	menus/templatetags/menu_tags.py
	setup.py
	test_requirements/django-1.4.txt
	test_requirements/django-1.5.txt
	test_requirements/requirements_base.txt

Author: yakky

CHANGELOG.txt

@@ -361,7 +361,11 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Limits version of django-mptt used in CMS for 3.0.x
 - Prevent accidental upgrades to Django 1.8, which is not yet supported
 
-==== 3.1 (unreleased) ===
+=== 3.0.14 (XXXX-XX-XX) ===
+
+- Fixed an issue related to "Empty all" Placeholder feature
+
+=== 3.1 (2015-04-20) ===
 
 - Remove django-mptt in favor of django-treebeard
 - Remove compatibility with Django 1.4 / 1.5
@@ -374,4 +378,8 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Remove deprecated cms.context_processors.media context processor
 - Add templatetag render_plugin_block
 - Add templatetag render_model_add_block
-- Add "Structure mode" permission
+- Add "Structure mode" permission
+
+=== 3.1.1 (XXXX-XX-XX) ===
+
+- Add Django 1.8 support

cms/admin/change_list.py

@@ -90,9 +90,9 @@ def get_results(self, request):
         if self.real_queryset:
             super(CMSChangeList, self).get_results(request)
             if not self.is_filtered():
-                self.full_result_count = self.result_count = self.root_queryset.count()
+                self.full_result_count = self.result_count = self.root_queryset.drafts().count()
             else:
-                self.full_result_count = self.root_queryset.count()
+                self.full_result_count = self.root_queryset.drafts().count()
 
     def set_items(self, request):
         site = self.current_site()

cms/admin/forms.py

@@ -235,7 +235,8 @@ def __init__(self, *args, **kwargs):
             self.fields['language'].initial = get_language()
         if 'navigation_extenders' in self.fields:
             self.fields['navigation_extenders'].widget = forms.Select(
-                {}, [('', "---------")] + menu_pool.get_menus_by_attribute("cms_enabled", True))
+                {}, [('', "---------")] + menu_pool.get_menus_by_attribute(
+                    "cms_enabled", True))
         if 'application_urls' in self.fields:
             # Prepare a dict mapping the apps by class name ('PollApp') to
             # their app_name attribute ('polls'), if any.

cms/appresolver.py

@@ -1,6 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    # Python < 2.7
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.exceptions import ImproperlyConfigured
@@ -198,10 +204,11 @@ def get_app_patterns():
 
     title_qs = Title.objects.public().filter(page__site=current_site)
 
-    hooked_applications = {}
+    hooked_applications = OrderedDict()
 
     # Loop over all titles with an application hooked to them
-    for title in title_qs.exclude(page__application_urls=None).exclude(page__application_urls='').select_related():
+    # TODO: Need to be fixed for django-treebeard when forward ported to 3.1
+    for title in title_qs.exclude(page__application_urls=None).exclude(page__application_urls='').order_by('-page__path').select_related():
         path = title.path
         mix_id = "%s:%s:%s" % (path + "/", title.page.application_urls, title.language)
         if mix_id in included:

cms/cms_toolbar.py

@@ -16,7 +16,7 @@
 from cms.toolbar.items import TemplateItem
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
-from cms.utils.i18n import get_language_tuple, force_language
+from cms.utils.i18n import get_language_tuple, force_language, get_language_dict
 from cms.utils.compat.dj import is_installed
 from cms.utils import get_cms_setting
 from cms.utils.permissions import get_user_sites_queryset
@@ -368,13 +368,11 @@ def change_language_menu(self):
             if not language_menu:
                 return None
 
-            languages = get_language_tuple(self.current_site.pk)
-            languages_dict = dict(languages)
-
-            remove = [(code, languages_dict.get(code, code)) for code in self.page.get_languages()]
-            add = [l for l in languages if l not in remove]
-            copy = [(code, name) for code, name in languages if code != self.current_lang and (code, name) in remove]
+            languages = get_language_dict(self.current_site.pk)
 
+            remove = [(code, languages.get(code, code)) for code in self.page.get_languages() if code in languages]
+            add = [l for l in languages.items() if l not in remove]
+            copy = [(code, name) for code, name in languages.items() if code != self.current_lang and (code, name) in remove]
             if add:
                 language_menu.add_break(ADD_PAGE_LANGUAGE_BREAK)
                 page_change_url = admin_reverse('cms_page_change', args=(self.page.pk,))

cms/menu.py

@@ -128,8 +128,11 @@ def page_to_node(page, home, cut):
     # Extenders can be either navigation extenders or from apphooks.
     extenders = []
     if page.navigation_extenders:
-        extenders.append(page.navigation_extenders)
-        # Is this page an apphook? If so, we need to handle the apphooks's nodes
+        if page.navigation_extenders in menu_pool.menus:
+            extenders.append(page.navigation_extenders)
+        elif "{0}:{1}".format(page.navigation_extenders, page.pk) in menu_pool.menus:
+            extenders.append("{0}:{1}".format(page.navigation_extenders, page.pk))
+    # Is this page an apphook? If so, we need to handle the apphooks's nodes
     lang = get_language()
     # Only run this if we have a translation in the requested language for this
     # object. The title cache should have been prepopulated in CMSMenu.get_nodes
@@ -201,9 +204,11 @@ def get_nodes(self, request):
                 home = page
             if first and page.pk != home.pk:
                 home_cut = True
-            if (page.parent_id == home.pk or page.parent_id in home_children) and home_cut:
+            if (home_cut and (page.parent_id == home.pk or 
+                    page.parent_id in home_children)):
                 home_children.append(page.pk)
-            if (page.pk == home.pk and home.in_navigation) or page.pk != home.pk:
+            if ((page.pk == home.pk and home.in_navigation)
+                    or page.pk != home.pk):
                 first = False
             ids[page.id] = page
             actual_pages.append(page)
@@ -213,7 +218,8 @@ def get_nodes(self, request):
         if not hide_untranslated(lang):
             langs.extend(get_fallback_languages(lang))
 
-        titles = list(get_title_queryset(request).filter(page__in=ids, language__in=langs))
+        titles = list(get_title_queryset(request).filter(
+            page__in=ids, language__in=langs))
         for title in titles:  # add the title and slugs and some meta data
             page = ids[title.page_id]
             page.title_cache[title.language] = title
@@ -231,23 +237,23 @@ class NavExtender(Modifier):
     def modify(self, request, nodes, namespace, root_id, post_cut, breadcrumb):
         if post_cut:
             return nodes
-        exts = []
         # rearrange the parent relations
-        home = None
+        # Find home
+        home = next((n for n in nodes if n.attr.get("is_home", False)), None)
+        # Find nodes with NavExtenders
+        exts = []
         for node in nodes:
-            if node.attr.get("is_home", False):
-                home = node
             extenders = node.attr.get("navigation_extenders", None)
             if extenders:
                 for ext in extenders:
                     if ext not in exts:
                         exts.append(ext)
+                    # Link the nodes
                     for extnode in nodes:
                         if extnode.namespace == ext and not extnode.parent_id:
                             # if home has nav extenders but home is not visible
-                            if (node.attr.get("is_home", False)
-                                    and not node.visible):
-                                extnode.parent_id = None
+                            if node == home and not node.visible:
+                                # extnode.parent_id = None
                                 extnode.parent_namespace = None
                                 extnode.parent = None
                             else:
@@ -398,7 +404,8 @@ def find_ancestors_and_remove_children(self, node, nodes):
                 node.parent.parent = None
                 nodes = [node.parent] + nodes
             else:
-                nodes = self.find_ancestors_and_remove_children(node.parent, nodes)
+                nodes = self.find_ancestors_and_remove_children(
+                    node.parent, nodes)
         else:
             for newnode in nodes:
                 if newnode != node and not newnode.parent:

cms/static/cms/js/modules/cms.changelist.js

@@ -29,7 +29,9 @@ $(document).ready(function () {
 				initTree();
 			} else {
 				// when filtered is active, prevent tree actions
+				this.setupFunctions();
 				this.setupUIHacks();
+				$.syncCols();
 			}
 		},
 

cms/templatetags/cms_tags.py

@@ -4,6 +4,11 @@
 from itertools import chain
 import re
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 from django import template
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -910,8 +915,9 @@ def _get_empty_context(self, context, instance, edit_fields, language,
                 edit_fields = 'title,page_title,menu_title'
             view_url = 'admin:cms_page_edit_title_fields'
         if edit_fields == 'changelist':
-            view_url = 'admin:cms_page_changelist'
-        querystring = {'language': language}
+            view_url = 'admin:%s_%s_changelist' % (
+                instance._meta.app_label, instance._meta.model_name)
+        querystring = OrderedDict((('language', language),))
         if edit_fields:
             extra_context['edit_fields'] = edit_fields.strip().split(",")
         # If the toolbar is not enabled the following part is just skipped: it

cms/test_utils/project/sampleapp/cms_app.py

@@ -1,5 +1,5 @@
 from cms.app_base import CMSApp
-from cms.test_utils.project.sampleapp.menu import SampleAppMenu
+from cms.test_utils.project.sampleapp.menu import SampleAppMenu, StaticMenu3
 from cms.apphook_pool import apphook_pool
 from django.utils.translation import ugettext_lazy as _
 
@@ -27,6 +27,7 @@ class SampleAppWithExcludedPermissions(CMSApp):
 class SampleApp2(CMSApp):
     name = _("Sample App 2")
     urls = ["cms.test_utils.project.sampleapp.urls2"]
+    menus = [StaticMenu3]
 
 apphook_pool.register(SampleApp2)
 
@@ -37,7 +38,21 @@ class NamespacedApp(CMSApp):
         "cms.test_utils.project.sampleapp.ns_urls",
         "cms.test_utils.project.sampleapp.urls"
     ]
-    menus = [SampleAppMenu]
+    menus = [SampleAppMenu, StaticMenu3]
     app_name = 'namespaced_app_ns'
 
 apphook_pool.register(NamespacedApp)
+
+
+class ParentApp(CMSApp):
+    name = _("Parent app")
+    urls = ["cms.test_utils.project.sampleapp.urls_parentapp"]
+
+apphook_pool.register(ParentApp)
+
+
+class ChildApp(CMSApp):
+    name = _("Child app")
+    urls = ["cms.test_utils.project.sampleapp.urls_childapp"]
+
+apphook_pool.register(ChildApp)

cms/test_utils/project/sampleapp/menu.py

@@ -47,19 +47,10 @@ def get_nodes(self, request):
 menu_pool.register_menu(StaticMenu)
 
 
-class StaticMenu2(CMSAttachMenu):
+class StaticMenu2(StaticMenu):
     name = _("Static Menu2")
-
-    def get_nodes(self, request):
-        nodes = []
-        n = NavigationNode('static2 root page', "/fresh/", 1)
-        n2 = NavigationNode('static2 settings page', "/bye/", 2)
-        n3 = NavigationNode('static2 account page', "/hello/", 3)
-        n4 = NavigationNode('static2 my profile page', "/hello/world/", 4, 3)
-        nodes.append(n)
-        nodes.append(n2)
-        nodes.append(n3)
-        nodes.append(n4)
-        return nodes
-
 menu_pool.register_menu(StaticMenu2)
+
+class StaticMenu3(StaticMenu):
+    name = _("Static Menu3")
+menu_pool.register_menu(StaticMenu3)

cms/test_utils/project/sampleapp/urls.py

@@ -3,6 +3,9 @@
 
 from . import views
 
+"""
+Also used in cms.tests.ApphooksTestCase
+"""
 urlpatterns = [
     url(r'^$', views.sample_view, {'message': 'sample root page',}, name='sample-root'),
     url(r'^exempt/$', views.exempt_view, {'message': 'sample root page',}, name='sample-exempt'),
@@ -13,5 +16,7 @@
     url(r'^category/(?P<id>[0-9]+)/$', views.category_view, name='category_view'),
     url(r'^notfound/$', views.notfound, name='notfound'),
     url(r'^extra_1/$', views.extra_view, {'message': 'test urlconf'}, name='extra_first'),
+    url(r'^class-view/$', views.ClassView(), name='sample-class-view'),
+    url(r'^class-based-view/$', views.ClassBasedView.as_view(), name='sample-class-based-view'),
     url(r'^', include('cms.test_utils.project.sampleapp.urls_extra'), {'opts': 'someopts'}),
 ]

cms/test_utils/project/sampleapp/urls_childapp.py

@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from cms.test_utils.project.sampleapp import views
+
+urlpatterns = [
+    url(r'^(?P<path>.+)$', views.childapp_view, name='childapp_view'),
+]

cms/test_utils/project/sampleapp/urls_parentapp.py

@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from cms.test_utils.project.sampleapp import views
+
+urlpatterns = [
+    url(r'^(?P<path>.+)$', views.parentapp_view, name='parentapp_view'),
+]

cms/test_utils/project/sampleapp/views.py

@@ -1,10 +1,12 @@
 # Create your views here.
-from django.views.decorators.csrf import csrf_exempt
-from cms.utils.urlutils import admin_reverse
 from django.http import Http404
 from django.shortcuts import render
-from cms.test_utils.project.sampleapp.models import Category
 from django.utils.translation import ugettext_lazy as _
+from django.views.decorators.csrf import csrf_exempt
+from django.views.generic.base import TemplateView
+
+from cms.test_utils.project.sampleapp.models import Category
+from cms.utils.urlutils import admin_reverse
 
 
 @csrf_exempt
@@ -54,3 +56,23 @@ def plain_view(request):
 
 def notfound(request):
     raise Http404
+
+
+class ClassView(object):
+    def __call__(self, request, *args, **kwargs):
+        context = {'content': 'plain text'}
+        return render(request, "sampleapp/plain.html", context)
+
+
+class ClassBasedView(TemplateView):
+    template_name = 'sampleapp/plain.html'
+
+
+def parentapp_view(request, path):
+    context = {'content': 'parent app content'}
+    return render(request, "sampleapp/plain.html", context)
+
+
+def childapp_view(request, path):
+    context = {'content': 'child app content'}
+    return render(request, "sampleapp/plain.html", context)