From 43260fb59f5ba4d1b5c9cdcd6971255a590a229e Mon Sep 17 00:00:00 2001 From: Brian Wiborg Date: Sat, 26 Sep 2015 19:22:25 +0200 Subject: [PATCH 1/2] 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 @@

Login

-
{% 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 From ebe3a3a7e13157a75572d83514fff89a718f3c88 Mon Sep 17 00:00:00 2001 From: Uwe Kamper Date: Tue, 29 Sep 2015 21:34:54 +0200 Subject: [PATCH 2/2] upgrade templates to named urls for django-1.8 --- account/templates/admin.html | 2 +- account/templates/clabpin.html | 2 +- account/templates/gastropin.html | 2 +- account/templates/group_list.html | 1 - account/templates/member_base.html | 18 +++++++++--------- account/templates/nrf24.html | 2 +- account/templates/password.html | 2 +- account/templates/rfid.html | 2 +- account/templates/sippin.html | 2 +- account/templates/wlan_presence.html | 2 +- 10 files changed, 17 insertions(+), 18 deletions(-) diff --git a/account/templates/admin.html b/account/templates/admin.html index 6e7adc9..8bd8d28 100644 --- a/account/templates/admin.html +++ b/account/templates/admin.html @@ -9,7 +9,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/clabpin.html b/account/templates/clabpin.html index 0525404..13965fe 100644 --- a/account/templates/clabpin.html +++ b/account/templates/clabpin.html @@ -9,7 +9,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/gastropin.html b/account/templates/gastropin.html index 593f7fb..ff476d6 100644 --- a/account/templates/gastropin.html +++ b/account/templates/gastropin.html @@ -14,7 +14,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/group_list.html b/account/templates/group_list.html index 0548fb2..d29f9ab 100644 --- a/account/templates/group_list.html +++ b/account/templates/group_list.html @@ -1,7 +1,6 @@ {% extends "base.html" %} {% block container %} - BLA

members of {{ group.name }}

diff --git a/account/templates/member_base.html b/account/templates/member_base.html index 6b850e9..6f629a1 100644 --- a/account/templates/member_base.html +++ b/account/templates/member_base.html @@ -4,41 +4,41 @@ {% block body %}
    - {% url account.views.home as home_url %} + {% url 'home' as home_url %}
  • {% trans "Home" %}
    • - {% url account.views.password as password_url %} + {% url 'password' as password_url %}
  • {% trans "Password" %}
    • - {% url account.views.gastropin as gastro_url %} + {% url 'gastropin' as gastro_url %}
  • {% trans "Gastro-PIN" %}
    • - {% url account.views.wlan_presence as wlan_presence_url %} + {% url 'wlan_presence' as wlan_presence_url %}
  • {% trans "WiFi presence" %}
    • - {% url account.views.rfid as rfid_url %} + {% url 'rfid' as rfid_url %}
  • {% trans "RFID" %}
    • - {% url account.views.clabpin as clab_url %} + {% url 'clabpin' as clab_url %}
  • {% trans "c-lab-PIN" %}
    • - {% url account.views.nrf24 as nrf24_url %} + {% url 'nrf24' as nrf24_url %}
  • {% trans "NRF24" %}
    • - {% url account.views.sippin as sippin_url %} + {% url 'sippin' as sippin_url %}
  • {% trans "SIP-PIN" %}
    • {% for group in request.user.groups.all %} {% if group.name == 'ldap_admins' %} - {% url account.views.admin as admin_url %} + {% url 'admin' as admin_url %}
  • {% trans "Admin" %} diff --git a/account/templates/nrf24.html b/account/templates/nrf24.html index 3f1617d..35482e9 100644 --- a/account/templates/nrf24.html +++ b/account/templates/nrf24.html @@ -10,7 +10,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/password.html b/account/templates/password.html index c1bb1e4..774070c 100644 --- a/account/templates/password.html +++ b/account/templates/password.html @@ -9,7 +9,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/rfid.html b/account/templates/rfid.html index 7e640e8..334063d 100644 --- a/account/templates/rfid.html +++ b/account/templates/rfid.html @@ -15,7 +15,7 @@ {% block form_fields %} {{ form.non_field_errors }} - {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/sippin.html b/account/templates/sippin.html index 2ff7d29..f2356f3 100644 --- a/account/templates/sippin.html +++ b/account/templates/sippin.html @@ -9,7 +9,7 @@ {% endblock %} {% block form_fields %} - + {% csrf_token %} {{ form|crispy }} diff --git a/account/templates/wlan_presence.html b/account/templates/wlan_presence.html index d26df1e..4cf5170 100644 --- a/account/templates/wlan_presence.html +++ b/account/templates/wlan_presence.html @@ -12,7 +12,7 @@ {% block form_fields %} {{ form.non_field_errors }} - + {% csrf_token %} {{ form|crispy }}