Commit 9e8dc36e authored by David Haynes's avatar David Haynes
Browse files

Merge branch 'master' of git.gmu.edu:srct/go

parents e33efa62 cdccd2ac
Pipeline #324 passed with stages
in 24 seconds
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<meta name="description" content="University branded URL shortener."> <meta name="description" content="University branded URL shortener.">
<meta name="author" content="Mason SRCT"> <meta name="author" content="Mason SRCT">
<meta name="robots" content="all"> <meta name="robots" content="all">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="http://fonts.googleapis.com/css?family=Carrois+Gothic" rel="stylesheet" type="text/css"> <link href="http://fonts.googleapis.com/css?family=Carrois+Gothic" rel="stylesheet" type="text/css">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
......
...@@ -173,7 +173,7 @@ def signup(request): ...@@ -173,7 +173,7 @@ def signup(request):
# Only send mail if we've defined the mailserver # Only send mail if we've defined the mailserver
if settings.EMAIL_HOST and settings.EMAIL_PORT: if settings.EMAIL_HOST and settings.EMAIL_PORT:
user_mail = request.user.registereduser.user + settings.EMAIL_DOMAIN user_mail = request.user.username + settings.EMAIL_DOMAIN
# Email sent to notify Admins # Email sent to notify Admins
to_admin = EmailMessage( to_admin = EmailMessage(
'Signup from %s' % (request.user.registereduser.user), 'Signup from %s' % (request.user.registereduser.user),
...@@ -285,7 +285,7 @@ def useradmin(request): ...@@ -285,7 +285,7 @@ def useradmin(request):
toapprove.approved = True toapprove.approved = True
toapprove.save() toapprove.save()
if settings.EMAIL_HOST and settings.EMAIL_PORT: if settings.EMAIL_HOST and settings.EMAIL_PORT:
user_mail = toapprove.user + settings.EMAIL_DOMAIN user_mail = toapprove.user.username + settings.EMAIL_DOMAIN
send_mail( send_mail(
'Your Account has been Approved!', 'Your Account has been Approved!',
###################### ######################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment