Merge branch 'develop'

Conflicts:
	cms/forms/widgets.py

Author: digi604

cms/__init__.py

@@ -1,17 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.4.0.alpha'
-
-# patch settings
-try:
-    from django.conf import settings
-    if 'cms' in settings.INSTALLED_APPS:
-        from conf import patch_settings
-        patch_settings()
-except ImportError:  # pragma: no cover
-    """
-    This exception means that either the application is being built, or is
-    otherwise installed improperly. Both make running patch_settings
-    irrelevant.
-    """
-    pass
+__version__ = '2.4.0.beta'
 

cms/admin/change_list.py

@@ -3,6 +3,7 @@
 from collections import defaultdict
 from cms.exceptions import NoHomeFound
 from cms.models import Title, Page, PageModeratorState
+from cms.utils.conf import get_cms_setting
 from cms.utils.permissions import get_user_sites_queryset
 from django.conf import settings
 from django.contrib.admin.views.main import ChangeList, ALL_VAR, IS_POPUP_VAR, \
@@ -145,7 +146,7 @@ def set_items(self, request):
             # using the ids dictionary means this check is constant time
             page.root_node = page.parent_id not in ids
 
-            if settings.CMS_PERMISSION:
+            if get_cms_setting('PERMISSION'):
                 # caching the permissions
                 page.permission_edit_cache = perm_edit_ids == Page.permissions.GRANT_ALL or page.pk in perm_edit_ids
                 page.permission_publish_cache = perm_publish_ids == Page.permissions.GRANT_ALL or page.pk in perm_publish_ids
@@ -204,7 +205,7 @@ def set_sites(self, request):
         """Sets sites property to current instance - used in tree view for
         sites combo.
         """
-        if settings.CMS_PERMISSION:
+        if get_cms_setting('PERMISSION'):
             self.sites = get_user_sites_queryset(request.user)   
         else:
             self.sites = Site.objects.all()

cms/admin/dialog/views.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 from cms.admin.dialog.forms import PermissionForm
 from cms.models import Page
+from cms.utils import get_cms_setting
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.http import Http404, HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
 
 @staff_member_required
 def get_copy_dialog(request, page_id):
-    if not settings.CMS_PERMISSION:
+    if not get_cms_setting('PERMISSION'):
         return HttpResponse('')
 
     page = get_object_or_404(Page, pk=page_id)

cms/admin/forms.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+from cms import constants
 from cms.apphook_pool import apphook_pool
 from cms.forms.widgets import UserSelectAdminWidget
 from cms.models import (Page, PagePermission, PageUser, ACCESS_PAGE, 
     PageUserGroup)
+from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_tuple, get_language_list
 from cms.utils.mail import mail_page_user_change
 from cms.utils.page import is_valid_page_slug
@@ -11,7 +13,6 @@
     get_subordinate_groups)
 from cms.utils.urlutils import any_path_re
 from django import forms
-from django.conf import settings
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
@@ -79,11 +80,11 @@ def __init__(self, *args, **kwargs):
         self.fields['language'].choices = languages
         if not self.fields['language'].initial:
             self.fields['language'].initial = get_language()
-        if self.fields['parent'].initial and \
-            settings.CMS_TEMPLATE_INHERITANCE_MAGIC in \
-            [name for name, value in settings.CMS_TEMPLATES]:
+        if (self.fields['parent'].initial and
+            get_cms_setting('TEMPLATE_INHERITANCE') in
+            [name for name, value in get_cms_setting('TEMPLATES')]):
             # non-root pages default to inheriting their template
-            self.fields['template'].initial = settings.CMS_TEMPLATE_INHERITANCE_MAGIC
+            self.fields['template'].initial = constants.TEMPLATE_INHERITANCE_MAGIC
 
     def clean(self):
         cleaned_data = self.cleaned_data

cms/admin/pageadmin.py

@@ -2,6 +2,7 @@
 from copy import deepcopy
 from distutils.version import LooseVersion
 from urllib2 import unquote
+from cms.utils.conf import get_cms_setting
 
 import django
 from django.conf import settings
@@ -73,7 +74,7 @@ def get_prepopulated_fields(self, request):
 
 
 def contribute_fieldsets(cls):
-    if settings.CMS_MENU_TITLE_OVERWRITE:
+    if get_cms_setting('MENU_TITLE_OVERWRITE'):
         general_fields = [('title', 'menu_title')]
     else:
         general_fields = ['title']
@@ -83,19 +84,19 @@ def contribute_fieldsets(cls):
     template_fields = ['template']
     hidden_fields = ['site', 'parent']
     seo_fields = []
-    if settings.CMS_SOFTROOT:
+    if get_cms_setting('SOFTROOT'):
         advanced_fields.append('soft_root')
-    if settings.CMS_SHOW_START_DATE and settings.CMS_SHOW_END_DATE:
+    if get_cms_setting('SHOW_START_DATE') and get_cms_setting('SHOW_END_DATE'):
         general_fields.append(('publication_date', 'publication_end_date'))
-    elif settings.CMS_SHOW_START_DATE:
+    elif get_cms_setting('SHOW_START_DATE'):
         general_fields.append('publication_date')
-    elif settings.CMS_SHOW_END_DATE:
+    elif get_cms_setting('SHOW_END_DATE'):
         general_fields.append('publication_end_date')
-    if settings.CMS_SEO_FIELDS:
+    if get_cms_setting('SEO_FIELDS'):
         seo_fields = ['page_title', 'meta_description', 'meta_keywords']
-    if not settings.CMS_URL_OVERWRITE:
+    if not get_cms_setting('URL_OVERWRITE'):
         advanced_fields.remove("overwrite_url")
-    if not settings.CMS_REDIRECTS:
+    if not get_cms_setting('REDIRECTS'):
         advanced_fields.remove('redirect')
     if menu_pool.get_menus_by_attribute("cms_enabled", True):
         advanced_fields.append("navigation_extenders")
@@ -122,7 +123,7 @@ def contribute_fieldsets(cls):
         }),
     ]
 
-    if settings.CMS_SEO_FIELDS:
+    if get_cms_setting('SEO_FIELDS'):
         fieldsets.append((_("SEO Settings"), {
                           'fields': seo_fields,
                           'classes': ('collapse',),
@@ -138,7 +139,7 @@ def contribute_fieldsets(cls):
 
 def contribute_list_filter(cls):
     list_filter = ['published', 'in_navigation', 'template', 'changed_by']
-    if settings.CMS_SOFTROOT:
+    if get_cms_setting('SOFTROOT'):
         list_filter.append('soft_root')
     setattr(cls, 'list_filter', list_filter)
 
@@ -303,7 +304,7 @@ def get_fieldsets(self, request, obj=None):
             advanced = given_fieldsets.pop(3)
             if obj.has_advanced_settings_permission(request):
                 given_fieldsets.append(advanced)
-            if settings.CMS_SEO_FIELDS:
+            if get_cms_setting('SEO_FIELDS'):
                 seo = given_fieldsets.pop(3)
                 given_fieldsets.append(seo)
         else: # new page
@@ -329,7 +330,7 @@ def get_form(self, request, obj=None, **kwargs):
             elif 'published' in self.exclude:
                 self.exclude.remove('published')
 
-            if not settings.CMS_SOFTROOT and 'soft_root' in self.exclude:
+            if not get_cms_setting('SOFTROOT') and 'soft_root' in self.exclude:
                 self.exclude.remove('soft_root')
 
             form = super(PageAdmin, self).get_form(request, obj, **kwargs)
@@ -358,9 +359,9 @@ def get_form(self, request, obj=None, **kwargs):
                 form.base_fields['overwrite_url'].initial = title_obj.path
             else:
                 form.base_fields['overwrite_url'].initial = ""
-            if settings.CMS_TEMPLATES:
+            if get_cms_setting('TEMPLATES'):
                 selected_template = get_template_from_request(request, obj)
-                template_choices = list(settings.CMS_TEMPLATES)
+                template_choices = list(get_cms_setting('TEMPLATES'))
                 form.base_fields['template'].choices = template_choices
                 form.base_fields['template'].initial = force_unicode(selected_template)
 
@@ -439,18 +440,18 @@ def get_form(self, request, obj=None, **kwargs):
                 form.base_fields[name].initial = u''
             form.base_fields['parent'].initial = request.GET.get('target', None)
             form.base_fields['site'].initial = request.session.get('cms_admin_site', None)
-            form.base_fields['template'].initial = settings.CMS_TEMPLATES[0][0]
+            form.base_fields['template'].initial = get_cms_setting('TEMPLATES')[0][0]
 
         return form
 
     def get_inline_instances(self, request):
         inlines = super(PageAdmin, self).get_inline_instances(request)
-        if settings.CMS_PERMISSION and hasattr(self, '_current_page')\
+        if get_cms_setting('PERMISSION') and hasattr(self, '_current_page')\
                 and self._current_page:
             filtered_inlines = []
             for inline in inlines:
-                if isinstance(inline, PagePermissionInlineAdmin)\
-                        and not isinstance(inline, ViewRestrictionInlineAdmin):
+                if (isinstance(inline, PagePermissionInlineAdmin)
+                        and not isinstance(inline, ViewRestrictionInlineAdmin)):
                     if "recover" in request.path or "history" in request.path:
                         # do not display permissions in recover mode
                         continue
@@ -486,7 +487,7 @@ def change_view(self, request, object_id, extra_context=None):
             context = {
                 'placeholders': self.get_fieldset_placeholders(selected_template),
                 'page': obj,
-                'CMS_PERMISSION': settings.CMS_PERMISSION,
+                'CMS_PERMISSION': get_cms_setting('PERMISSION'),
                 'ADMIN_MEDIA_URL': settings.STATIC_URL,
                 'can_change': obj.has_change_permission(request),
                 'can_change_permissions': obj.has_change_permissions_permission(request),
@@ -553,7 +554,7 @@ def has_add_permission(self, request):
         """
         Return true if the current user has permission to add a new page.
         """
-        if settings.CMS_PERMISSION:
+        if get_cms_setting('PERMISSION'):
             return permissions.has_page_add_permission(request)
         return super(PageAdmin, self).has_add_permission(request)
 
@@ -562,7 +563,7 @@ def has_change_permission(self, request, obj=None):
         Return true if the current user has permission on the page.
         Return the string 'All' if the user has all rights.
         """
-        if settings.CMS_PERMISSION:
+        if get_cms_setting('PERMISSION'):
             if obj:
                 return obj.has_change_permission(request)
             else:
@@ -575,7 +576,7 @@ def has_delete_permission(self, request, obj=None):
         Django model instance. If CMS_PERMISSION are in use also takes look to
         object permissions.
         """
-        if settings.CMS_PERMISSION and obj is not None:
+        if get_cms_setting('PERMISSION') and obj is not None:
             return obj.has_delete_permission(request)
         return super(PageAdmin, self).has_delete_permission(request, obj)
 
@@ -644,10 +645,10 @@ def changelist_view(self, request, extra_context=None):
             'has_add_permission': self.has_add_permission(request),
             'root_path': reverse('admin:index'),
             'app_label': app_label,
-            'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
-            'CMS_SHOW_END_DATE': settings.CMS_SHOW_END_DATE,
-            'softroot': settings.CMS_SOFTROOT,
-            'CMS_PERMISSION': settings.CMS_PERMISSION,
+            'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
+            'CMS_SHOW_END_DATE': get_cms_setting('SHOW_END_DATE'),
+            'softroot': get_cms_setting('SOFTROOT'),
+            'CMS_PERMISSION': get_cms_setting('PERMISSION'),
             'DEBUG': settings.DEBUG,
             'site_languages': languages,
             'open_menu_trees': open_menu_trees,
@@ -712,7 +713,7 @@ def change_template(self, request, object_id):
             return HttpResponseForbidden(_("You do not have permission to change the template"))
 
         to_template = request.POST.get("template", None)
-        if to_template not in dict(settings.CMS_TEMPLATES):
+        if to_template not in dict(get_cms_setting('TEMPLATES')):
             return HttpResponseBadRequest(_("Template not valid"))
 
         page.template = to_template
@@ -1170,7 +1171,7 @@ def add_plugin(self, request):
             reversion.revision.comment = _(u"%(plugin_name)s plugin added to %(placeholder)s") % {
                 'plugin_name': plugin_name, 'placeholder': placeholder}
 
-        return HttpResponse(str(plugin.pk))
+        return HttpResponse(str(plugin.pk), content_type='text/plain')
 
     @require_POST
     @create_on_success
@@ -1270,7 +1271,7 @@ def edit_plugin(self, request, plugin_id):
         if request.POST.get("_cancel", False):
             # cancel button was clicked
             context = {
-                'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
+                'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
                 'plugin': cms_plugin,
                 'is_popup': True,
                 'name': unicode(cms_plugin),
@@ -1317,7 +1318,7 @@ def edit_plugin(self, request, plugin_id):
             saved_object = plugin_admin.saved_object
 
             context = {
-                'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
+                'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
                 'plugin': saved_object,
                 'is_popup': True,
                 'name': unicode(saved_object),

cms/admin/permissionadmin.py

@@ -3,6 +3,7 @@
     PagePermissionInlineAdminForm, ViewRestrictionInlineAdminForm)
 from cms.exceptions import NoPermissionsException
 from cms.models import Page, PagePermission, GlobalPagePermission, PageUser
+from cms.utils.conf import get_cms_setting
 from cms.utils.permissions import get_user_permission_level
 from copy import deepcopy
 from distutils.version import LooseVersion
@@ -180,7 +181,7 @@ def has_change_permission(self, request, obj=None):
             super(self.__class__, self).has_change_permission(request, obj)
 
 
-if settings.CMS_PERMISSION:
+if get_cms_setting('PERMISSION'):
     admin.site.register(GlobalPagePermission, GlobalPagePermissionAdmin)
     PAGE_ADMIN_INLINES.extend([
         ViewRestrictionInlineAdmin,

cms/admin/placeholderadmin.py

@@ -4,7 +4,7 @@
 from cms.models.placeholdermodel import Placeholder
 from cms.models.pluginmodel import CMSPlugin
 from cms.plugin_pool import plugin_pool
-from cms.utils import get_language_from_request, cms_static_url
+from cms.utils import get_language_from_request, cms_static_url, get_cms_setting
 from cms.utils.permissions import has_plugin_permission
 from copy import deepcopy
 from django.conf import settings
@@ -151,7 +151,7 @@ def add_plugin(self, request):
             return HttpResponseForbidden(_("You don't have permission to add content here."))
 
         # check the limits defined in CMS_PLACEHOLDER_CONF for this placeholder
-        limits = settings.CMS_PLACEHOLDER_CONF.get(placeholder.slot, {}).get('limits', None)
+        limits = get_cms_setting('PLACEHOLDER_CONF').get(placeholder.slot, {}).get('limits', None)
         if limits:
             count = placeholder.cmsplugin_set.count()
             global_limit = limits.get("global", None)
@@ -206,7 +206,7 @@ def edit_plugin(self, request, plugin_id):
         if request.POST.get("_cancel", False):
             # cancel button was clicked
             context = {
-                'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
+                'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
                 'plugin': cms_plugin,
                 'is_popup': True,
                 'name': unicode(cms_plugin),
@@ -241,7 +241,7 @@ def edit_plugin(self, request, plugin_id):
             saved_object = plugin_admin.saved_object
 
             context = {
-                'CMS_MEDIA_URL': settings.CMS_MEDIA_URL, 
+                'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
                 'plugin': saved_object, 
                 'is_popup': True, 
                 'name': unicode(saved_object), 

cms/admin/useradmin.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from cms.utils.conf import get_cms_setting
 from django.conf import settings
 from django.utils.translation import ugettext as _
 
@@ -58,6 +59,6 @@ class PageUserGroupAdmin(admin.ModelAdmin, GenericCmsPermissionAdmin):
     def get_fieldsets(self, request, obj=None):
         return self.update_permission_fieldsets(request, obj)
 
-if settings.CMS_PERMISSION:    
+if get_cms_setting('PERMISSION'):
     admin.site.register(PageUser, PageUserAdmin)
-    admin.site.register(PageUserGroup, PageUserGroupAdmin)
+    admin.site.register(PageUserGroup, PageUserGroupAdmin)