Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cms/admin/pageadmin.py
	cms/admin/placeholderadmin.py

Author: peterfarrell

AUTHORS

@@ -302,6 +302,7 @@ Contributors (based on gitlog) (440):
 * mrlundis
 * mvaerle
 * MW
+* Nelson Brochado
 * neoprolog
 * Nick Jones
 * Nickolay V. Shmyrev
@@ -460,4 +461,4 @@ Contributors (based on gitlog) (440):
 * zundoya
 * Óscar M. Lage
 * Øyvind Saltvik
-* Антон Евжаков
+* Антон Евжаков

CHANGELOG.txt

@@ -292,10 +292,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Added list of retired core developers
 - Added branch policy documentaion
 
-<<<<<<< HEAD
-=== 3.1 (unreleased) ===
-=======
-=== 3.0.8 (2015-01-11) ===
+==== 3.0.8 (2015-01-11) ===
 - Add require_parent option to CMS_PLACEHOLDER_CONF
 - Fix django-mptt version depenency to be PEP440 compatible
 - Fix some Django 1.4 compatibility issues
@@ -309,9 +306,25 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Documentation fixes
 - Minor code cleanups
 
-=== 3.0.9 (2015-01-11) ===
+==== 3.0.9 (2015-01-11) ===
 - Revert a change that caused a regression in toolbar login
 - Fix an error in a translated phrase
 - Fix error when moving items in the page tree
 
->>>>>>> upstream/support/3.0.x
+=== 3.0.10 (2015-02-14) ===
+- Improved Py3 compatibility
+- Improved the behavior when changing the operator's language
+- Numerous documentation updates
+- Revert a change that caused an issue with saving plugins in some browsers
+- Fix an issue where urls were not refreshed when a page slug changes
+- Fix an issue with FR translations
+- Fixed an issue preventing the correct rendering of custom contextual menu items for plugins
+- Fixed an issue relating to recovering deleted pages
+- Fixed an issue that caused the uncached placeholder tag to display cached content
+- Fixed an issue where extra slashed would appear in apphooked URLs when APPEND_SLASH=False
+- Fixed issues relating to the logout function
+
+==== 3.1 (unreleased) ===
+- Removed django-mptt in favor of django-treebeard
+- Removed compatibility with Django 1.4 / 1.5
+- General code cleanup

README.rst

@@ -18,7 +18,7 @@ Open source enterprise content management system based on the django framework.
 .. ATTENTION:: This is the **develop** branch. It's the branch for features that
    will go into django CMS 3.1. The **master** branch is the current stable release,
    the one released on PyPI.
-   
+
    **support/3.0.x** will be our *next stable release*, the most
    appropriate branch for fixes and patches that will go into the next **master**.
 

cms/admin/change_list.py

@@ -7,7 +7,7 @@
 from django.contrib.admin.views.main import ChangeList, ALL_VAR, IS_POPUP_VAR, \
     ORDER_TYPE_VAR, ORDER_VAR, SEARCH_VAR
 from django.contrib.sites.models import Site
-import django
+
 
 COPY_VAR = "copy"
 
@@ -45,7 +45,8 @@ class CMSChangeList(ChangeList):
     real_queryset = False
 
     def __init__(self, request, *args, **kwargs):
-        from cms.utils.plugins import current_site
+        from cms.utils.helpers import current_site
+
         self._current_site = current_site(request)
         super(CMSChangeList, self).__init__(request, *args, **kwargs)
         try:
@@ -58,29 +59,25 @@ def __init__(self, request, *args, **kwargs):
             request.session['cms_admin_site'] = self._current_site.pk
         self.set_sites(request)
 
-    def get_queryset(self, request=None):
+    def get_queryset(self, request):
         if COPY_VAR in self.params:
             del self.params[COPY_VAR]
         if 'language' in self.params:
             del self.params['language']
         if 'page_id' in self.params:
             del self.params['page_id']
-        if django.VERSION[1] > 3:
-            qs = super(CMSChangeList, self).get_queryset(request).drafts()
-        else:
-            qs = super(CMSChangeList, self).get_queryset().drafts()
-        if request:
-            site = self.current_site()
-            permissions = Page.permissions.get_change_id_list(request.user, site)
-            if permissions != Page.permissions.GRANT_ALL:
-                qs = qs.filter(pk__in=permissions)
-                self.root_queryset = self.root_queryset.filter(pk__in=permissions)
-            self.real_queryset = True
-            qs = qs.filter(site=self._current_site)
+        qs = super(CMSChangeList, self).get_queryset(request).drafts()
+        site = self.current_site()
+        permissions = Page.permissions.get_change_id_list(request.user, site)
+        if permissions != Page.permissions.GRANT_ALL:
+            qs = qs.filter(pk__in=permissions)
+            self.root_queryset = self.root_queryset.filter(pk__in=permissions)
+        self.real_queryset = True
+        qs = qs.filter(site=self._current_site)
         return qs
 
     def is_filtered(self):
-        from cms.utils.plugins import SITE_VAR
+        from cms.utils.helpers import SITE_VAR
         lookup_params = self.params.copy() # a dictionary of the query string
         for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR, SITE_VAR, 'language', 'page_id'):
             if i in lookup_params:

cms/admin/forms.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
@@ -8,14 +9,14 @@
 from django.forms.util import ErrorList
 from django.forms.widgets import HiddenInput
 from django.template.defaultfilters import slugify
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _, get_language
 
 from cms.apphook_pool import apphook_pool
 from cms.constants import PAGE_TYPES_ID
 from cms.forms.widgets import UserSelectAdminWidget, AppHookSelect
 from cms.models import Page, PagePermission, PageUser, ACCESS_PAGE, PageUserGroup, Title, EmptyTitle, \
     GlobalPagePermission
-from cms.utils.compat.dj import get_user_model, force_unicode
 from cms.utils.compat.forms import UserCreationForm
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_tuple
@@ -30,7 +31,7 @@
 
 def get_permission_acessor(obj):
     User = get_user_model()
-    
+
     if isinstance(obj, (PageUser, User,)):
         rel_name = 'user_permissions'
     else:
@@ -113,7 +114,7 @@ def __init__(self, *args, **kwargs):
     def clean(self):
         cleaned_data = self.cleaned_data
         slug = cleaned_data.get('slug', '')
-        
+
         page = self.instance
         lang = cleaned_data.get('language', None)
         # No language, can not go further, but validation failed already
@@ -146,7 +147,7 @@ def clean(self):
                     if hasattr(exc, 'messages'):
                         errors = exc.messages
                     else:
-                        errors = [force_unicode(exc.message)]
+                        errors = [force_text(exc.message)]
                     self._errors['slug'] = ErrorList(errors)
         return cleaned_data
 
@@ -328,7 +329,7 @@ class PagePermissionInlineAdminForm(forms.ModelForm):
     """
     Page permission inline admin form used in inline admin. Required, because
     user and group queryset must be changed. User can see only users on the same
-    level or under him in choosen page tree, and users which were created by him, 
+    level or under him in choosen page tree, and users which were created by him,
     but aren't assigned to higher page level than current user.
     """
     page = forms.ModelChoiceField(Page.objects.all(), label=_('user'), widget=HiddenInput(), required=True)
@@ -392,7 +393,7 @@ def clean(self):
         # check if access for childrens, or descendants is granted
         if can_add and self.cleaned_data['grant_on'] == ACCESS_PAGE:
             # this is a missconfiguration - user can add/move page to current
-            # page but after he does this, he will not have permissions to 
+            # page but after he does this, he will not have permissions to
             # access this page anymore, so avoid this
             raise forms.ValidationError(_("Add page permission requires also "
                                           "access to children, or descendants, otherwise added page "
@@ -422,6 +423,7 @@ def save(self, commit=True):
         return instance
 
     class Meta:
+        fields = '__all__'
         model = PagePermission
 
 
@@ -441,6 +443,7 @@ def clean(self):
         return self.cleaned_data
 
     class Meta:
+        fields = '__all__'
         model = GlobalPagePermission
 
 
@@ -483,6 +486,7 @@ class PageUserForm(UserCreationForm, GenericCmsPermissionForm):
                                          'Send email notification to user about username or password change. Requires user email.'))
 
     class Meta:
+        fields = '__all__'
         model = PageUser
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
@@ -537,7 +541,7 @@ def clean(self):
         return cleaned_data
 
     def save(self, commit=True):
-        """Create user, assign him to staff users, and create permissions for 
+        """Create user, assign him to staff users, and create permissions for
         him if required. Also assigns creator to user.
         """
         Super = self._password_change and PageUserForm or UserCreationForm