Merge pull request django-cms#3500 from jsma/pagefield-fix

Fixed PageField to work with Django 1.7

Author: yakky

cms/forms/fields.py

@@ -33,12 +33,14 @@ class PageSelectFormField(forms.MultiValueField):
     }
 
     def __init__(self, queryset=None, empty_label=u"---------", cache_choices=False,
-                 required=True, widget=None, to_field_name=None, *args, **kwargs):
+                 required=True, widget=None, to_field_name=None, limit_choices_to=None,
+                  *args, **kwargs):
         errors = self.default_error_messages.copy()
         if 'error_messages' in kwargs:
             errors.update(kwargs['error_messages'])
         site_choices = SuperLazyIterator(get_site_choices)
         page_choices = SuperLazyIterator(get_page_choices)
+        self.limit_choices_to = limit_choices_to
         kwargs['required'] = required
         fields = (
             LazyChoiceField(choices=site_choices, required=False, error_messages={'invalid': errors['invalid_site']}),

cms/models/fields.py

@@ -83,9 +83,10 @@ class PageField(models.ForeignKey):
     default_model_class = Page
 
     def __init__(self, **kwargs):
-        # we call ForeignKey.__init__ with the Page model as parameter...
-        # a PageField can only be a ForeignKey to a Page
-        super(PageField, self).__init__(self.default_model_class, **kwargs)
+        # We hard-code the `to` argument for ForeignKey.__init__
+        # since a PageField can only be a ForeignKey to a Page
+        kwargs['to'] = self.default_model_class
+        super(PageField, self).__init__(**kwargs)
 
     def formfield(self, **kwargs):
         defaults = {