Quellcode durchsuchen

Rework how we tell if there is a profile class

master
David Winterbottom vor 12 Jahren
Ursprung
Commit
9d2a1ca24d
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. 2
    2
      oscar/apps/customer/forms.py
  2. 3
    0
      oscar/core/loading.py

+ 2
- 2
oscar/apps/customer/forms.py Datei anzeigen

@@ -236,8 +236,8 @@ class UserForm(forms.ModelForm):
236 236
                    'user_permissions', 'groups')
237 237
 
238 238
 
239
-if hasattr(settings, 'AUTH_PROFILE_MODULE'):
240
-    Profile = get_profile_class()
239
+Profile = get_profile_class()
240
+if Profile:
241 241
 
242 242
     class UserAndProfileForm(forms.ModelForm):
243 243
         first_name = forms.CharField(

+ 3
- 0
oscar/core/loading.py Datei anzeigen

@@ -104,6 +104,9 @@ def get_profile_class():
104 104
     """
105 105
     Return the profile model class
106 106
     """
107
+    setting = getattr(settings, 'AUTH_PROFILE_MODULE', None)
108
+    if setting is None:
109
+        return None
107 110
     app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.')
108 111
     profile_class = get_model(app_label, model_name)
109 112
     if not profile_class:

Laden…
Abbrechen
Speichern