Removes a unused import statement, causing the sximporter not to load under some...

[osqa.git] / forum_modules / localauth / views.py

diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py
index 8df278c456703b5a8c46cfc15bb862a01c6ac5ee..e1daff3e7b87b8bb551a36207ed21743ec869596 100644 (file)
--- a/forum_modules/localauth/views.py
+++ b/forum_modules/localauth/views.py
@@ -4,8 +4,8 @@ from django.template import RequestContext
 from django.utils.translation import ugettext as _
 
 from forms import ClassicRegisterForm
 from django.utils.translation import ugettext as _
 
 from forms import ClassicRegisterForm

-from forum.authentication.forms import SimpleEmailSubscribeForm
-from forum.views.auth import login_and_forward, send_validation_email
+from forum.forms import SimpleEmailSubscribeForm
+from forum.views.auth import login_and_forward

 from forum.actions import UserJoinsAction
 
 def register(request):
 from forum.actions import UserJoinsAction
 
 def register(request):


@@ -23,16 +23,16 @@ def register(request):
 
             if User.objects.all().count() == 0:
                 user_.is_superuser = True
 
             if User.objects.all().count() == 0:
                 user_.is_superuser = True

+                user_.is_staff = True

 
             user_.save()
             UserJoinsAction(user=user_, ip=request.META['REMOTE_ADDR']).save()
 
             user_.save()
             UserJoinsAction(user=user_, ip=request.META['REMOTE_ADDR']).save()

-            
-            send_validation_email(user_)
+

             if email_feeds_form.cleaned_data['subscribe'] == 'n':
                 user_.subscription_settings.enable_notifications = False
                 user_.subscription_settings.save()
 
             if email_feeds_form.cleaned_data['subscribe'] == 'n':
                 user_.subscription_settings.enable_notifications = False
                 user_.subscription_settings.save()
 

-            return login_and_forward(request, user_, None, _("A validation email has been sent to your email address. "))
+            return login_and_forward(request, user_, None, _("A welcome email has been sent to your email address. "))

     else:
         form = ClassicRegisterForm(initial={'next':'/'})
         email_feeds_form = SimpleEmailSubscribeForm()
     else:
         form = ClassicRegisterForm(initial={'next':'/'})
         email_feeds_form = SimpleEmailSubscribeForm()