Merge branch 'releases/1.2' of github.com:awesto/django-shop into rel…

…eases/1.2
awesto · Jun 16, 2020 · 510df50 · 510df50
2 parents f3a4772 + 85c777e
commit 510df50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/shop/cascade/auth.py b/shop/cascade/auth.py
@@ -17,7 +17,7 @@
     ('password-reset-request', _("Request Password Reset")),
     ('password-reset-confirm', _("Confirm Password Reset")),
     ('password-change', _("Change Password Form")),
-    ('register-user', _("Register User"), 'shop.forms.auth.RegisterUserForm'),
+    ('register-user', _("Register User"), app_settings.SHOP_CASCADE_FORMS['RegisterUserForm']),
     ('continue-as-guest', _("Continue as guest")),
 ]
 

diff --git a/shop/conf.py b/shop/conf.py
@@ -313,6 +313,7 @@ def SHOP_CASCADE_FORMS(self):
             'ShippingMethodForm': 'shop.forms.checkout.ShippingMethodForm',
             'ExtraAnnotationForm': 'shop.forms.checkout.ExtraAnnotationForm',
             'AcceptConditionForm': 'shop.forms.checkout.AcceptConditionForm',
+            'RegisterUserForm': 'shop.forms.auth.RegisterUserForm',
         }
         cascade_forms.update(self._setting('SHOP_CASCADE_FORMS', {}))
         return cascade_forms