Skip to content

Commit

Permalink
Merge pull request #301 from colegleason/change-from-address
Browse files Browse the repository at this point in the history
member_database: put quotes around from address name
  • Loading branch information
colegleason committed Feb 13, 2015
2 parents 3759915 + 2e1abcc commit 6b73422
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions liquid/intranet/member_database/views.py
Expand Up @@ -22,7 +22,7 @@ def main(request):
"page":'members',
"pre_members": pre_members
},context_instance=RequestContext(request))

def search(request):
q = request.GET.get('q')
if q:
Expand All @@ -45,7 +45,7 @@ def search(request):
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
members = paginator.page(paginator.num_pages)

return render_to_response('intranet/member_database/search.html',{
"section":"intranet",
"page":'members',
Expand Down Expand Up @@ -100,12 +100,12 @@ def new(request,id):
Approved by: %s"""%(u.first_name,u.last_name,u.date_joined.strftime("%a %b %d, %Y %H:%M:%S"),request.user.username)
send_mail('Welcome to ACM@UIUC', welcome_msg, 'ACM at UIUC <acm@acm.illinois.edu>',[u.email,'payment-mailer@acm.illinois.edu'], fail_silently=False)
send_mail('Welcome to ACM@UIUC', welcome_msg, '"ACM@UIUC" <acm@acm.illinois.edu>',[u.email,'payment-mailer@acm.illinois.edu'], fail_silently=False)
return HttpResponseRedirect('/intranet/members/search?q=%s' % u.username) # Redirect after POST
except ValueError:
messages.add_message(request, messages.ERROR, "Not a valid netid")

return HttpResponseRedirect('/intranet/members/')
return HttpResponseRedirect('/intranet/members/')

@group_admin_required(['Top4'])
def edit(request,id):
Expand Down

0 comments on commit 6b73422

Please sign in to comment.