From 1ed3f3f4b95b44f885d4316515eaae929c779334 Mon Sep 17 00:00:00 2001 From: Brian Wiborg Date: Sat, 26 Oct 2013 21:16:41 +0200 Subject: [PATCH 1/3] add crispy forms to requirements --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5a224e6..e5d0614 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Django==1.4.2 MySQL-python==1.2.4 - django-auth-ldap==1.1.4 +django-auth-ldap==1.1.4 django-json-rpc==0.6.1 +django-crispy-forms==1.4.0 From d24e853fcd8fdc59824d76835c44dc33a8346c00 Mon Sep 17 00:00:00 2001 From: Brian Wiborg Date: Sat, 26 Oct 2013 21:35:25 +0200 Subject: [PATCH 2/3] show landingpage even if there are no groups, yet --- account/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/account/views.py b/account/views.py index f8b8f5e..8353253 100644 --- a/account/views.py +++ b/account/views.py @@ -31,7 +31,10 @@ def landingpage(request): if 'ldap_admins' in [g.name for g in request.user.groups.all()]: is_admin = True 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']) #return render_to_response("dashboard.html", locals()) From 0bb8b03fcb79c95950646404bad425467351bb53 Mon Sep 17 00:00:00 2001 From: Brian Wiborg Date: Sat, 26 Oct 2013 22:25:26 +0200 Subject: [PATCH 3/3] add submodule support to dev_setup script --- dev_env_setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev_env_setup.sh b/dev_env_setup.sh index 5e5d5c1..ff0e29f 100644 --- a/dev_env_setup.sh +++ b/dev_env_setup.sh @@ -7,6 +7,8 @@ cd cbmi source bin/activate git clone git@github.com:c-base/cbmi.git src cd src +git submodule init +git submodule update pip install -r requirements.txt cat <