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
This commit is contained in:
baccenfutter 2015-09-26 19:22:25 +02:00
parent 5717a10402
commit 43260fb59f
4 changed files with 10 additions and 7 deletions

View file

@ -119,7 +119,7 @@
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h4>Login</h4> <h4>Login</h4>
<form class="form" action="/account/login/?next={% url account.views.home %}" <form class="form" action="/account/login/?next=/"
method="post"> method="post">
{% csrf_token %} {% csrf_token %}
{{ login_form|crispy }} {{ login_form|crispy }}

View file

@ -178,7 +178,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.admindocs', 'django.contrib.admindocs',
'jsonrpc', #'jsonrpc', # STUBBED due to django-1.8.4 upgraded
'crispy_forms', 'crispy_forms',
# 'cbmi', # 'cbmi',
'account', 'account',

View file

@ -5,6 +5,9 @@ import sys
if __name__ == "__main__": if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cbmi.settings") 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 from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)

View file

@ -1,7 +1,7 @@
Django==1.4.2 Django==1.8.4
MySQL-python==1.2.4 #MySQL-python==1.2.5
django-auth-ldap==1.1.4 django-auth-ldap==1.2.6
django-json-rpc==0.6.1 django-json-rpc
django-crispy-forms==1.4.0 django-crispy-forms==1.5.2
pycrypto==2.6.1 pycrypto==2.6.1
smbpasswd==1.0.2 smbpasswd==1.0.2