Merge pull request bread-and-pepper#344 from nephila/feature/fixes

Misc fixes.
interalia-desarrolloweb · Aug 19, 2013 · 1f012bd · 1f012bd
2 parents 51a7f44 + 2bb6134
commit 1f012bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/userena/admin.py b/userena/admin.py
@@ -4,6 +4,7 @@
 from guardian.admin import GuardedModelAdmin
 
 from userena.models import UserenaSignup
+from userena import settings as userena_settings
 from userena.utils import get_profile_model, get_user_model
 
 class UserenaSignupInline(admin.StackedInline):
@@ -17,13 +18,13 @@ class UserenaAdmin(UserAdmin, GuardedModelAdmin):
     list_filter = ('is_staff', 'is_superuser', 'is_active')
 
 
-if settings.USERENA_REGISTER_USER:
+if userena_settings.USERENA_REGISTER_USER:
     try:
         admin.site.unregister(get_user_model())
     except admin.sites.NotRegistered:
         pass
 
     admin.site.register(get_user_model(), UserenaAdmin)
 
-if settings.USERENA_REGISTER_PROFILE:    
+if userena_settings.USERENA_REGISTER_PROFILE:    
     admin.site.register(get_profile_model())
diff --git a/userena/urls.py b/userena/urls.py
@@ -23,7 +23,7 @@
        auth_views.password_reset,
        {'template_name': 'userena/password_reset_form.html',
         'email_template_name': 'userena/emails/password_reset_message.txt',
-        'extra_context': {'without_username': userena_settings.USERENA_WITHOUT_USERNAMES}
+        'extra_context': {'without_usernames': userena_settings.USERENA_WITHOUT_USERNAMES}
         },
        name='userena_password_reset'),
     url(r'^password/reset/done/$',