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

Merge branch 'hotfix/0.2.3'

Browse source
This commit is contained in:
baccenfutter 2013-10-29 19:38:47 +01:00
commit ca822adb52
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
account/templates/home.html
View file

@ -7,8 +7,8 @@
<h2>{% trans "Welcome to the c-base member interface" %}</h2> <h2>{% trans "Welcome to the c-base member interface" %}</h2>
<p class="leas">You are one of currently {{ number_of_members }} <p class="leas">You are one of currently {{ number_of_members }}
c-base members.</p> c-base members.</p>
<p>{% blocktrans %}Here you can change <p>{% blocktrans %}Here you can change some parameters of your
some parameters of your c-base member account.{% endblocktrans %}</p> c-base member account.{% endblocktrans %}</p>
<h3>{% trans "Basic information about your account" %}</h3> <h3>{% trans "Basic information about your account" %}</h3>
@ -18,9 +18,9 @@
<code>{{ member.uid }}</code></li> <code>{{ member.uid }}</code></li>
<li>{% trans "Numeric user ID:" %} <li>{% trans "Numeric user ID:" %}
<code>{{ member.uidNumber }}</code><br /> <code>{{ member.uidNumber }}</code><br />
<span class="muted">{% blocktrans %}The numeric user ID can be used to login with <span class="muted">{% blocktrans %}The numeric user ID can
the vending machines and network connected combination be used to login with the vending machines and network
locks.{% endblocktrans %}</span></li> connected combination locks.{% endblocktrans %}</span></li>
<li> <li>
{% trans "Your c-base e-mail address:" %} {% trans "Your c-base e-mail address:" %}
<code>{{ member.mail }}</code> <code>{{ member.mail }}</code>

5
account/views.py
View file

@ -2,10 +2,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
import base64
import hashlib import hashlib
from django.conf import settings from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
@ -73,7 +71,8 @@ def auth_login(request):
def home(request): def home(request):
member = retrieve_member(request) member = retrieve_member(request)
number_of_members = member.get_number_of_members() number_of_members = member.get_number_of_members()
context = {'member': member.to_dict(), 'groups': request.user.groups.all(), context = {'member': member.to_dict(),
'groups': sorted(list(request.user.groups.all())),
'number_of_members': number_of_members} 'number_of_members': number_of_members}
return render(request, 'home.html', context) return render(request, 'home.html', context)