From c1756c64afbf39f359e90787c141771249cf2edc Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 29 Aug 2018 11:42:36 +0100
Subject: [PATCH] Updates to latest version of select2
---
opentech/apply/funds/templates/funds/submissions.html | 6 +++++-
opentech/settings/base.py | 1 +
opentech/settings/production.py | 5 -----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html
index dce637a3a..197f268dd 100644
--- a/opentech/apply/funds/templates/funds/submissions.html
+++ b/opentech/apply/funds/templates/funds/submissions.html
@@ -2,6 +2,10 @@
{% load render_table from django_tables2 %}
{% block title %}Submissions{% endblock %}
+{% block extra_css %}
+ {{ filter.form.media.css }}
+{% endblock %}
+
{% block content %}
<div class="admin-bar">
<div class="admin-bar__inner wrapper--search">
@@ -50,5 +54,5 @@
{% endblock %}
{% block extra_js %}
- {{ filter.form.media }}
+ {{ filter.form.media.js }}
{% endblock %}
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index fe9ac09d1..848192414 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -546,6 +546,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
if 'SECURE_HSTS_SECONDS' in env:
try:
SECURE_HSTS_SECONDS = int(env['SECURE_HSTS_SECONDS'])
+ except ValueError:
pass
if env.get('SECURE_BROWSER_XSS_FILTER', 'true').lower().strip() == 'true':
diff --git a/opentech/settings/production.py b/opentech/settings/production.py
index 0ecfc47c7..4c4978cc6 100644
--- a/opentech/settings/production.py
+++ b/opentech/settings/production.py
@@ -24,8 +24,3 @@ if 'MAILGUN_API_KEY' in env:
django_heroku.settings(locals())
-
-try:
- from .local import * # noqa
-except ImportError:
- pass
--
GitLab