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:
smile 2013-10-26 22:41:29 +02:00
commit 643305886d
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
account/views.py
View file

@ -31,7 +31,10 @@ def landingpage(request):
if 'ldap_admins' in [g.name for g in request.user.groups.all()]: if 'ldap_admins' in [g.name for g in request.user.groups.all()]:
is_admin = True is_admin = True
groups = Group.objects.all() groups = Group.objects.all()
admins = Group.objects.get(name="ldap_admins").user_set.all() try:
admins = Group.objects.get(name="ldap_admins").user_set.all()
except:
admins = []
# values = get_user_values(request.user.username, request.session['ldap_password']) # values = get_user_values(request.user.username, request.session['ldap_password'])
#return render_to_response("dashboard.html", locals()) #return render_to_response("dashboard.html", locals())

2
dev_env_setup.sh
View file

@ -7,6 +7,8 @@ cd cbmi
source bin/activate source bin/activate
git clone git@github.com:c-base/cbmi.git src git clone git@github.com:c-base/cbmi.git src
cd src cd src
git submodule init
git submodule update
pip install -r requirements.txt pip install -r requirements.txt
cat <<EOF cat <<EOF

3
requirements.txt
View file

@ -1,4 +1,5 @@
Django==1.4.2 Django==1.4.2
MySQL-python==1.2.4 MySQL-python==1.2.4
django-auth-ldap==1.1.4 django-auth-ldap==1.1.4
django-json-rpc==0.6.1 django-json-rpc==0.6.1
django-crispy-forms==1.4.0