Ensure promotions work correct with modified URL field

oscar/apps/dashboard/promotions/forms.py

@@ -5,7 +5,6 @@ from django.utils.translation import ugettext_lazy as _
 
 from oscar.forms.fields import ExtendedURLField
 from oscar.core.loading import get_classes
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
 
 RawHTML, SingleProduct, PagePromotion, HandPickedProductList, OrderedProduct = get_classes('promotions.models',
     ['RawHTML', 'SingleProduct', 'PagePromotion', 'HandPickedProductList',
@@ -37,10 +36,11 @@ OrderedProductFormSet = inlineformset_factory(HandPickedProductList,
 
 
 class PagePromotionForm(forms.ModelForm):
-    page_url = ExtendedURLField(label=_("URL"))
-    position = forms.CharField(widget=forms.Select(choices=settings.OSCAR_PROMOTION_POSITIONS),
-                               label=_("Position"),
-                               help_text=_("Where in the page this content block will appear"))
+    page_url = ExtendedURLField(label=_("URL"), verify_exists=True)
+    position = forms.CharField(
+        widget=forms.Select(choices=settings.PROMOTION_POSITIONS),
+        label=_("Position"),
+        help_text=_("Where in the page this content block will appear"))
 
     class Meta:
         model = PagePromotion
@@ -49,7 +49,6 @@ class PagePromotionForm(forms.ModelForm):
     def clean_page_url(self):
         page_url = self.cleaned_data.get('page_url')
         if (page_url and page_url.startswith('/') and
-            not page_url.endswith('/')):
+                not page_url.endswith('/')):
             page_url += '/'
         return page_url
-

oscar/apps/promotions/models.py

@@ -43,7 +43,8 @@ class PagePromotion(LinkedPromotion):
     """
     A promotion embedded on a particular page.
     """
-    page_url = ExtendedURLField(_('Page URL'), max_length=128, db_index=True)
+    page_url = ExtendedURLField(
+        _('Page URL'), max_length=128, db_index=True, verify_exists=True)
 
     def __unicode__(self):
         return u"%s on %s" % (self.content_object, self.page_url)

oscar/models/fields.py

@@ -24,6 +24,7 @@ class ExtendedURLField(CharField):
         # 'verify_exists' was deprecated in Django 1.4. To ensure backwards
         # compatibility, it is still accepted here, but only passed
         # on to the parent class if it was specified.
+        self.verify_exists = verify_exists
         if verify_exists is not None:
             validator = validators.ExtendedURLValidator(
                 verify_exists=verify_exists)
@@ -36,6 +37,7 @@ class ExtendedURLField(CharField):
         # twice.
         defaults = {
             'form_class': fields.ExtendedURLField,
+            'verify_exists': self.verify_exists
         }
         defaults.update(kwargs)
         return super(ExtendedURLField, self).formfield(**defaults)