Fix django-1.10-horizon.test.settings.patch

Rewritten-From: 7bb395e6b916c24b1cbe48060f6e3f99d3c79143

diff --git a/xenial/debian/patches/django-1.10-horizon.test.settings.patch b/xenial/debian/patches/django-1.10-horizon.test.settings.patch
index 2f048cb1ae48e170366ef01ee15a446e3abc0121..b20ca42faed6b4daa936a27b752123e2cce4422a 100644 (file)
--- a/xenial/debian/patches/django-1.10-horizon.test.settings.patch
+++ b/xenial/debian/patches/django-1.10-horizon.test.settings.patch
@@ -22,7 +22,7 @@ Last-Update: 2016-07-21
      'django.contrib.messages.context_processors.messages',
      'horizon.context_processors.horizon')
  
-@@ -170,3 +170,27 @@ LOGGING = {
+@@ -170,3 +170,26 @@ LOGGING = {
          }
      }
  }
@@ -30,7 +30,6 @@ Last-Update: 2016-07-21
 +TEMPLATES = [
 +    {
 +        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-+        'APP_DIRS': True,
 +        'DIRS': [ os.path.join( os.path.dirname(os.path.abspath(__file__)), 'tests', 'templates'), ],
 +        'OPTIONS': {
 +            'context_processors': [
@@ -42,11 +41,11 @@ Last-Update: 2016-07-21
 +                'django.contrib.messages.context_processors.messages',
 +                'horizon.context_processors.horizon'
 +            ],
++            'loaders': [
++                'django.template.loaders.filesystem.Loader',
++                'django.template.loaders.app_directories.Loader',
++                'horizon.loaders.TemplateLoader'
++            ],
 +        },
-+        'loaders': [
-+            'django.template.loaders.filesystem.Loader',
-+            'django.template.loaders.app_directories.Loader',
-+            'horizon.loaders.TemplateLoader'
-+        ],
 +    },
 +]

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index d1fcceb472caedcd61698e002cbc15c7e8eb9c97..ff44a28b5fe654803b9fa31a32168429b046408c 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -6,5 +6,5 @@ django-1.10-django.conf.urls.patterns-removed.patch
 django-1.10-fix-wrong-django.conf.urls.url-call.patch
 django-1.10-fixes-get-form-uses-kwargs.patch
 django-1.10-openstack_dashboard.test.settings.patch
-django-1.10-horizon.test.settings.patch
 django-1.10-do-not-use-django.template.Context-function.patch
+django-1.10-horizon.test.settings.patch