{% endif %}
-{% if object_list %}
+{% if object_list %}{# List of non-stopped tasks #}
@@ -25,8 +25,8 @@ {% if stopped_tasks %}STOPPED TASKS{% else %}ONGOING TASKS{% endif %}
- {% for object in object_list %}
- {{ object.as_row_for_site_home|safe }}
+ {% for task in object_list %}
+ {{ task.as_row_for_site_home }}
{% endfor %}
diff --git a/prs2/urls.py b/prs2/urls.py
index adf5eeb5..e81319a6 100644
--- a/prs2/urls.py
+++ b/prs2/urls.py
@@ -1,32 +1,27 @@
from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.contrib import admin
+from django.contrib.auth.views import login, logout
from api import v1_api
admin.autodiscover()
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
- url(r'^login/$', 'django.contrib.auth.views.login', name='login',
- kwargs={'template_name': 'login.html'}),
- url(r'^logout/$', 'django.contrib.auth.views.logout', name='logout',
- kwargs={'template_name': 'logged_out.html'}),
+ url(r'^login/$', login, name='login', kwargs={'template_name': 'login.html'}),
+ url(r'^logout/$', logout, name='logout', kwargs={'template_name': 'logged_out.html'}),
url(r'^explorer/', include('explorer.urls')), # django-sql-explorer
-)
+]
# Additional URLS for development/debug.
if settings.DEBUG:
# Add in Debug Toolbar URLs.
import debug_toolbar
- urlpatterns += patterns(
- '', (r'^__debug__/', include(debug_toolbar.urls)),
- )
+ urlpatterns.append(url(r'^__debug__/', include(debug_toolbar.urls)))
# PRS project URLs - must be placed after the debug_toolbar URLs.
-urlpatterns += patterns(
- '',
+urlpatterns += [
url(r'^api/', include(v1_api.urls)), # All API views are registered in api.py
url(r'^reports/', include('reports.urls')),
url(r'^', include('referral.urls')),
-)
+]
diff --git a/requirements.txt b/requirements.txt
index e1f2d557..a8a569c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,32 +1,31 @@
# Project requirements
-Django==1.8.7
-django-extensions==1.5.9
-https://static.dpaw.wa.gov.au/static/py/dpaw-utils/dist/dpaw-utils-0.3a3.tar.gz
+Django==1.9.7
+django-extensions==1.6.1
+https://static.dpaw.wa.gov.au/static/py/dpaw-utils/dist/dpaw-utils-0.3a11.tar.gz
+django-reversion==1.10.1
+django-debug-toolbar==1.4
+django-tastypie==0.13.3
+django-taggit==0.19.0
+django-braces==1.8.1
+django-autoslug==1.9.3
+django-crispy-forms==1.6.0
+django-sql-explorer==0.9.2
+django-model-utils==2.4
+django-storages==1.4
+django-bootstrap-pagination==1.6.1
+dj-static==0.0.6
Unipath==1.1
+Unidecode==0.04.18
Fabric==1.10.1
jinja2==2.8
-dj-static==0.0.6
-django-model-utils==2.3.1
-django-reversion==1.9.3
-django-guardian==1.3
-django-storages==1.1.8
-django-debug-toolbar==1.3.2
Pillow==2.7.0
-django-taggit==0.17.3
coverage==3.7.1
-mixer==5.1.8
-django-braces==1.8.1
+mixer==5.5.5
+django-webtest==1.7.8
python-magic==0.4.10
lxml==3.4.0
-django-crispy-forms==1.5.2
-django-bootstrap-pagination==1.5.1
django-downloadview==1.8
webtemplate-dpaw==0.4.2
-django-tastypie==0.12.2
selenium==2.46.1
-django-autoslug==1.8.0
openpyxl==2.2.6
-django-sql-explorer==0.8
tqdm==3.4.0
-Unidecode==0.04.18
-django-webtest==1.7.8
diff --git a/wercker.yml b/wercker.yml
deleted file mode 100644
index a878e329..00000000
--- a/wercker.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# This references the default Python container from
-# the Docker Hub with the 2.7 tag:
-# https://registry.hub.docker.com/_/python/
-# If you want to use a slim Python container with
-# version 3.4.3 you would use: python:3.4-slim
-# If you want Google's container you would reference google/python
-# Read more about containers on our dev center
-# http://devcenter.wercker.com/docs/containers/index.html
-box: wercker/python
-# You can also use services such as databases. Read more on our dev center:
-# http://devcenter.wercker.com/docs/services/index.html
-services:
- - mies/postgis@0.0.5
-
-# This is the build pipeline. Pipelines are the core of wercker
-# Read more about pipelines on our dev center
-# http://devcenter.wercker.com/docs/pipelines/index.html
-build:
- # The steps that will be executed on build
- # Steps make up the actions in your pipeline
- # Read more about steps on our dev center:
- # http://devcenter.wercker.com/docs/steps/index.html
- steps:
- # A step that sets up the python virtual environment
- - virtualenv:
- name: setup virtual environment
- install_wheel: false # Enable wheel to speed up builds (experimental)
-
- # # Use this virtualenv step for python 3.2
- # - virtualenv
- # name: setup virtual environment
- # python_location: /usr/bin/python3.2
-
- # A step that executes `pip install` command.
- # https://github.com/wercker/step-pip-install
- - pip-install
-
- # # This pip-install clears the local wheel cache
- # - pip-install:
- # clean_wheel_dir: true
-
- # A custom script step, name value is used in the UI
- # and the code value contains the command that get executed
- - script:
- name: echo python information
- code: |
- echo "python version $(python --version) running"
- echo "pip version $(pip --version) running"
- - script:
- name: run django tests
- code: |
- python manage.py test referral