From d916c1ca19554b65c16ec740761aef65244b8ada Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 10 May 2017 20:05:36 +0100 Subject: [PATCH] Update all the things, and fix some upgrade issues --- PyRIGS/decorators.py | 10 +++++----- PyRIGS/settings.py | 2 ++ PyRIGS/urls.py | 5 +++++ RIGS/migrations/0026_auto_20170510_1846.py | 21 +++++++++++++++++++++ RIGS/test_unit.py | 2 ++ RIGS/versioning.py | 6 +++--- 6 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 RIGS/migrations/0026_auto_20170510_1846.py diff --git a/PyRIGS/decorators.py b/PyRIGS/decorators.py index 1ae73e7d..68549449 100644 --- a/PyRIGS/decorators.py +++ b/PyRIGS/decorators.py @@ -1,5 +1,5 @@ from django.contrib.auth import REDIRECT_FIELD_NAME -from django.shortcuts import render_to_response +from django.shortcuts import render from django.template import RequestContext from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse @@ -26,15 +26,15 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None): return view_func(request, *args, **kwargs) elif not request.user.is_authenticated(): if oembed_view is not None: - context = RequestContext(request) + context = {} context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs)) context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path()) - resp = render_to_response('login_redirect.html', context=context) + resp = render(request, 'login_redirect.html', context=context) return resp else: return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path())) else: - resp = render_to_response('403.html', context=RequestContext(request)) + resp = render(request, '403.html') resp.status_code = 403 return resp _checklogin.__doc__ = view_func.__doc__ @@ -62,7 +62,7 @@ def api_key_required(function): userid = kwargs.get('api_pk') key = kwargs.get('api_key') - error_resp = render_to_response('403.html', context=RequestContext(request)) + error_resp = render(request, '403.html') error_resp.status_code = 403 if key is None: diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index d29c0e6b..5c010a23 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -33,6 +33,7 @@ if STAGING: if DEBUG: ALLOWED_HOSTS.append('localhost') + ALLOWED_HOSTS.append('example.com') SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') if not DEBUG: @@ -66,6 +67,7 @@ INSTALLED_APPS = ( MIDDLEWARE_CLASSES = ( 'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware', 'django.middleware.security.SecurityMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', 'reversion.middleware.RevisionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', diff --git a/PyRIGS/urls.py b/PyRIGS/urls.py index cbfcbfa0..65bf2e63 100644 --- a/PyRIGS/urls.py +++ b/PyRIGS/urls.py @@ -22,3 +22,8 @@ urlpatterns = [ if settings.DEBUG: urlpatterns += staticfiles_urlpatterns() + + import debug_toolbar + urlpatterns = [ + url(r'^__debug__/', include(debug_toolbar.urls)), + ] + urlpatterns diff --git a/RIGS/migrations/0026_auto_20170510_1846.py b/RIGS/migrations/0026_auto_20170510_1846.py new file mode 100644 index 00000000..0a350f10 --- /dev/null +++ b/RIGS/migrations/0026_auto_20170510_1846.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.1 on 2017-05-10 17:46 +from __future__ import unicode_literals + +import django.contrib.auth.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0025_auto_20160331_1302'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='username', + field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'), + ), + ] diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py index 82a7acca..0b22d84e 100644 --- a/RIGS/test_unit.py +++ b/RIGS/test_unit.py @@ -164,6 +164,8 @@ class TestInvoiceDelete(TestCase): def setUpTestData(cls): cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True) + cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') + cls.events = { 1: models.Event.objects.create(name="TE E1", start_date=date.today()), 2: models.Event.objects.create(name="TE E2", start_date=date.today()) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index d22f425c..65d4328a 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -199,7 +199,7 @@ def get_changes_for_version(newVersion, oldVersion=None): class VersionHistory(generic.ListView): - model = reversion.revisions.Version + model = Version template_name = "RIGS/version_history.html" paginate_by = 25 @@ -236,7 +236,7 @@ class VersionHistory(generic.ListView): class ActivityTable(generic.ListView): - model = reversion.revisions.Version + model = Version template_name = "RIGS/activity_table.html" paginate_by = 25 @@ -260,7 +260,7 @@ class ActivityTable(generic.ListView): class ActivityFeed(generic.ListView): - model = reversion.revisions.Version + model = Version template_name = "RIGS/activity_feed_data.html" paginate_by = 25