Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update and test django 1.8
Roland Geidere343f962301f
diff --git a/.travis.yml b/.travis.ymlindex 4fb66f335..b29a2b9bd 100644--- a/.travis.yml+++ b/.travis.yml@@ -14,10 +14,10 @@ python:# Manually define here the combinations environment variables to test# https://github.com/travis-ci/travis-ci/issues/1519env:- - DJANGO_VERSION=1.7.10 TEST_MOBILE=True DB=postgresql- - DJANGO_VERSION=1.7.10 TEST_MOBILE=True DB=sqlite- - DJANGO_VERSION=1.7.10 TEST_MOBILE=False DB=postgresql- - DJANGO_VERSION=1.7.10 TEST_MOBILE=False DB=sqlite+ - DJANGO_VERSION=1.8.4 TEST_MOBILE=True DB=postgresql+ - DJANGO_VERSION=1.8.4 TEST_MOBILE=True DB=sqlite+ - DJANGO_VERSION=1.8.4 TEST_MOBILE=False DB=postgresql+ - DJANGO_VERSION=1.8.4 TEST_MOBILE=False DB=sqlite# Install the applicationinstall:diff --git a/requirements.txt b/requirements.txtindex 47fda29e1..313c68a7e 100644--- a/requirements.txt+++ b/requirements.txt@@ -2,11 +2,12 @@# Requirements for wger for production#-Django>=1.7,<1.8+Django>=1.8,<1.9django-browserid==0.11django-recaptchareportlabdjango_mobile+django-formtoolsbleachpython-mimeparsepillowdiff --git a/wger/weight/views.py b/wger/weight/views.pyindex cf4ddd03a..b4c3c8bc1 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -24,7 +24,6 @@ from django.http import HttpResponseRedirectfrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazyfrom django.contrib.auth.decorators import login_required-from django.contrib.formtools.preview import FormPreviewfrom django.utils import formatsfrom django.utils.translation import ugettext as _from django.utils.translation import ugettext_lazy@@ -32,13 +31,16 @@ from django.db.models import Minfrom django.db.models import Maxfrom django.views.generic import CreateViewfrom django.views.generic import UpdateView+from rest_framework.response import Responsefrom rest_framework.decorators import api_view-from wger.utils.helpers import check_access++from formtools.preview import FormPreviewfrom wger.weight.forms import WeightFormfrom wger.weight.models import WeightEntryfrom wger.weight import helpers+from wger.utils.helpers import check_accessfrom wger.utils.generic_views import WgerFormMixin