From 43260fb59f5ba4d1b5c9cdcd6971255a590a229e Mon Sep 17 00:00:00 2001
From: Brian Wiborg <baccenfutter@c-base.org>
Date: Sat, 26 Sep 2015 19:22:25 +0200
Subject: [PATCH] first efforts bumping to django-1.8.4

- most things are working
- I had to throw away the db and run `manage.py migrate`
- the top-nav in once logged in is still broken
---
 account/templates/base.html |  2 +-
 cbmi/settings.py            |  2 +-
 manage.py                   |  3 +++
 requirements.txt            | 10 +++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/account/templates/base.html b/account/templates/base.html
index 6b7eac3..7051c62 100644
--- a/account/templates/base.html
+++ b/account/templates/base.html
@@ -119,7 +119,7 @@
             <div class="span4">
                 <div class="well">
                 <h4>Login</h4>
-                    <form class="form" action="/account/login/?next={% url account.views.home %}"
+                    <form class="form" action="/account/login/?next=/"
                           method="post">
                         {% csrf_token %}
                         {{ login_form|crispy }}
diff --git a/cbmi/settings.py b/cbmi/settings.py
index c74ecf9..bf48090 100644
--- a/cbmi/settings.py
+++ b/cbmi/settings.py
@@ -178,7 +178,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'jsonrpc',
+    #'jsonrpc',     # STUBBED due to django-1.8.4 upgraded
     'crispy_forms',
     # 'cbmi',
     'account',
diff --git a/manage.py b/manage.py
index 8d10597..c5b602c 100755
--- a/manage.py
+++ b/manage.py
@@ -5,6 +5,9 @@ import sys
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cbmi.settings")
 
+    from django.core.wsgi import get_wsgi_application
+    application = get_wsgi_application()
+
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
index c17f2f0..985a0e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-Django==1.4.2
-MySQL-python==1.2.4
-django-auth-ldap==1.1.4
-django-json-rpc==0.6.1
-django-crispy-forms==1.4.0
+Django==1.8.4
+#MySQL-python==1.2.5
+django-auth-ldap==1.2.6
+django-json-rpc
+django-crispy-forms==1.5.2
 pycrypto==2.6.1
 smbpasswd==1.0.2