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

Merge branch 'develop' of github.com:c-base/cbmi into develop

Browse source
This commit is contained in:
Uwe Kamper 2013-11-04 00:15:47 +01:00
commit 661fbad1f8
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
account/views.py
View file

@ -19,7 +19,7 @@ from django.utils.translation import ugettext as _
from forms import GastroPinForm, WlanPresenceForm, LoginForm, PasswordForm, \ from forms import GastroPinForm, WlanPresenceForm, LoginForm, PasswordForm, \
RFIDForm, NRF24Form, SIPPinForm, CLabPinForm, AdminForm RFIDForm, NRF24Form, SIPPinForm, CLabPinForm, AdminForm
from cbase_members import retrieve_member from cbase_members import retrieve_member, MemberValues
from password_encryption import * from password_encryption import *
def landingpage(request): def landingpage(request):
@ -235,16 +235,22 @@ def nrf24(request):
@login_required @login_required
def admin(request): def admin(request):
member = retrieve_member(request) admin_member = retrieve_member(request)
if request.user.groups.filter(name='ldap_admins').count() == 0: if request.user.groups.filter(name='ldap_admins').count() == 0:
return render(request, 'access_denied.html') return render(request, 'access_denied.html')
users = member.list_users() users = admin_member.list_users()
if request.method == 'POST': if request.method == 'POST':
form = AdminForm(request.POST, request=request, users=users) form = AdminForm(request.POST, request=request, users=users)
if form.is_valid(): if form.is_valid():
new_password = form.cleaned_data['password1'] new_password = form.cleaned_data['password1']
member.admin_change_password(form.cleaned_data['username'], new_password) admin_member.admin_change_password(form.cleaned_data['username'], new_password)
member = MemberValues(form.cleaned_data['username'], new_password)
member.set('sambaLMPassword', smbpasswd.lmhash(new_password))
member.set('sambaNTPassword', smbpasswd.nthash(new_password))
member.save()
new_form = AdminForm(request=request, users=users) new_form = AdminForm(request=request, users=users)
return render(request, 'admin.html', return render(request, 'admin.html',
{'message': _('The password for %s was changed. Thank you!' % form.cleaned_data['username']), {'message': _('The password for %s was changed. Thank you!' % form.cleaned_data['username']),
@ -262,4 +268,4 @@ def admin(request):
#admin_password = self._request.session['ldap_password'] #admin_password = self._request.session['ldap_password']
def hammertime(request): def hammertime(request):
return render(request, 'hammertime.html', {}) return render(request, 'hammertime.html', {})