smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check nickname feature - closes #20

Browse source
This commit is contained in:
baccenfutter 2013-11-24 23:49:12 +01:00
parent 05f4514b5c
commit e66ba60bf1
2 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
account/templates/base.html
View file

@ -118,16 +118,36 @@
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h4>Login</h4> <h4>Login</h4>
<form class="form" action="/account/login/?next={% url account.views.home %}" <form class="form" action="/account/login/?next={% url account.views.home %}"
method="post"> method="post">
{% csrf_token %} {% csrf_token %}
{{ form|crispy }} {{ login_form|crispy }}
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<button type="submit" class="btn btn-primary">{% trans "Sign in" %}</button> <button type="submit" class="btn btn-primary">{% trans "Sign in" %}</button>
</div>
</div> </div>
</div> </form>
</form> <hr />
<form class="form" action="/" method="get">
<input type="text" id="check_nickname" name="check_nickname">
<div class="control-group">
<div class="controls">
<button type="submit" class="btn">{% trans "Check nick" %}</button>
</div>
</div>
</form>
{% if not check_nickname == "" %}
{% if check_nickname %}
<div class="alert alert-danger alert-block">
{% blocktrans %}This nick is already taken.{% endblocktrans %}
</div>
{% else %}
<div class="alert alert-success alert-block">
{% blocktrans %}This nick is still available.{% endblocktrans %}
</div>
{% endif %}
{% endif %}
</div><!-- /.well --> </div><!-- /.well -->
</div> </div>
</div> </div>

22
account/views.py
View file

@ -6,7 +6,7 @@ import hashlib
import smbpasswd import smbpasswd
from django.conf import settings from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template.context import RequestContext from django.template.context import RequestContext
from django.contrib.auth import login, logout, authenticate from django.contrib.auth import login, logout, authenticate
@ -25,14 +25,28 @@ from password_encryption import *
def landingpage(request): def landingpage(request):
if request.user.is_authenticated(): if request.user.is_authenticated():
return HttpResponseRedirect('/account') return HttpResponseRedirect('/account')
form = LoginForm() login_form = LoginForm()
groups = Group.objects.all()
try: try:
# just in case the group hasn't yet been synced
admins = Group.objects.get(name="ldap_admins").user_set.all() admins = Group.objects.get(name="ldap_admins").user_set.all()
except: except:
# else provide an emtpy list
admins = [] admins = []
return render(request, 'base.html', {'form': form, 'admins': admins}) # https://github.com/c-base/cbmi/issues/20
# check if nick is still available feature
check_nickname = request.GET.get('check_nickname', '')
if check_nickname:
try:
user = User.objects.get(username=check_nickname)
check_nickname = True
# output as text if requested
if request.GET.get('raw', ''):
return HttpResponse(check_nickname)
except:
check_nickname = False
return render(request, 'base.html', locals())
def auth_login(request): def auth_login(request):
redirect_to = request.GET.get('next', '') or '/' redirect_to = request.GET.get('next', '') or '/'