From 4bf48b4be3c4ef7af904c6b078791081a698f1a7 Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Tue, 28 Aug 2018 17:07:01 -0700 Subject: [PATCH] DIV-889: Update to 1.10 --- edivorce/apps/core/templatetags/step_order.py | 2 +- edivorce/apps/core/templatetags/summary_format.py | 2 +- edivorce/apps/core/urls.py | 3 --- edivorce/apps/core/utils/step_completeness.py | 2 +- edivorce/apps/core/views/main.py | 12 +++--------- edivorce/apps/core/views/system.py | 2 +- edivorce/settings/base.py | 3 ++- edivorce/settings/local.py | 2 ++ edivorce/urls.py | 4 ++++ requirements.txt | 2 +- wsgi.py | 4 +++- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/edivorce/apps/core/templatetags/step_order.py b/edivorce/apps/core/templatetags/step_order.py index e22c7212..6eda0ce9 100644 --- a/edivorce/apps/core/templatetags/step_order.py +++ b/edivorce/apps/core/templatetags/step_order.py @@ -1,7 +1,7 @@ from django import template import json -from django.core.urlresolvers import reverse +from django.urls import reverse from ..utils.template_step_order import template_step_order, template_sub_step_order, get_step_name, \ get_step_or_sub_step_name diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py index c1131815..c5dbdb39 100644 --- a/edivorce/apps/core/templatetags/summary_format.py +++ b/edivorce/apps/core/templatetags/summary_format.py @@ -3,7 +3,7 @@ from collections import OrderedDict from django import template import json -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.html import format_html, format_html_join register = template.Library() diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index e3c9d920..9235d716 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -2,9 +2,6 @@ from django.conf.urls import url from .views import main, system, pdf, api, localdev -handler404 = 'core.views.main.page_not_found' -handler500 = 'core.views.main.server_error' - urlpatterns = [ # url(r'^guide$', styleguide.guide), url(r'^api/response$', api.UserResponseHandler.as_view()), diff --git a/edivorce/apps/core/utils/step_completeness.py b/edivorce/apps/core/utils/step_completeness.py index 7f984856..757d7ca2 100644 --- a/edivorce/apps/core/utils/step_completeness.py +++ b/edivorce/apps/core/utils/step_completeness.py @@ -1,4 +1,4 @@ -from django.core.urlresolvers import reverse +from django.urls import reverse from edivorce.apps.core.models import Question from edivorce.apps.core.utils.question_step_mapping import question_step_mapping, pre_qual_step_question_mapping diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index a739fffe..9c1383c4 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -1,7 +1,7 @@ import datetime from django.conf import settings -from django.shortcuts import render, redirect, render_to_response +from django.shortcuts import render, redirect from django.utils import timezone from django.template import RequestContext @@ -204,20 +204,14 @@ def page_not_found(request): """ 404 Error Page """ - response = render_to_response('404.html', {}, - context_instance=RequestContext(request)) - response.status_code = 404 - return response + return render(request, '404.html', status=404) def server_error(request): """ 500 Error Page """ - response = render_to_response('500.html', {}, - context_instance=RequestContext(request)) - response.status_code = 500 - return response + return render(request, '500.html', status=500) def legal(request): diff --git a/edivorce/apps/core/views/system.py b/edivorce/apps/core/views/system.py index 72b9eb58..abdd4720 100644 --- a/edivorce/apps/core/views/system.py +++ b/edivorce/apps/core/views/system.py @@ -1,7 +1,7 @@ from django.conf import settings from django.http import HttpResponse, Http404 from django.shortcuts import render, redirect -from django.core.urlresolvers import reverse +from django.urls import reverse from edivorce.apps.core.models import Question diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py index c5bdb0ef..28345194 100644 --- a/edivorce/settings/base.py +++ b/edivorce/settings/base.py @@ -56,7 +56,6 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'edivorce.apps.core.middleware.bceid_middleware.BceidMiddleware', @@ -144,3 +143,5 @@ DEBUG_TOOLBAR_CONFIG = { } SECURE_BROWSER_XSS_FILTER = True + +LOGOUT_URL = '/accounts/logout/' diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py index 64503673..8b215fed 100644 --- a/edivorce/settings/local.py +++ b/edivorce/settings/local.py @@ -25,3 +25,5 @@ PROXY_BASE_URL = '' SASS_PROCESSOR_ENABLED = True SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static' SASS_OUTPUT_STYLE = 'compressed' + +LOGOUT_URL = '/accounts/logout/' diff --git a/edivorce/urls.py b/edivorce/urls.py index 73bfa2d0..2e09695a 100644 --- a/edivorce/urls.py +++ b/edivorce/urls.py @@ -1,6 +1,7 @@ from django.conf import settings from django.conf.urls import include, url from django.contrib import admin +from .apps.core.views import main urlpatterns = [] @@ -12,3 +13,6 @@ if settings.ENVIRONMENT in ['localdev', 'minishift']: urlpatterns.append(url(r'^admin/', admin.site.urls)) urlpatterns.append(url(r'^', include('edivorce.apps.core.urls'))) + +handler404 = main.page_not_found +handler500 = main.server_error diff --git a/requirements.txt b/requirements.txt index 3d4c2e1e..87298c1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django<1.9 +Django<1.11 django-compressor==2.1 django-crispy-forms==1.6.1 django-debug-toolbar==1.9 diff --git a/wsgi.py b/wsgi.py index 30e572d4..ea1040ac 100644 --- a/wsgi.py +++ b/wsgi.py @@ -15,6 +15,7 @@ from django.core.management import execute_from_command_line # check if the app is running on OpenShift if not os.environ.get('OPENSHIFT_BUILD_NAMESPACE', False): os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edivorce.settings.local") + is_local = True else: os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edivorce.settings.openshift") @@ -32,6 +33,7 @@ if platform_name == "Windows": question_fixture_path = os.path.realpath("./edivorce/fixtures/Question.json") # load the Question fixture -execute_from_command_line(['manage.py', 'loaddata', question_fixture_path]) +if not is_local: + execute_from_command_line(['manage.py', 'loaddata', question_fixture_path]) application = get_wsgi_application()