From bacc77757330c278030f554c7f252720791b4156 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 21 Jul 2016 12:20:04 +0000 Subject: [PATCH] Add loaders in django-1.10-openstack_dashboard.test.settings.patch Rewritten-From: 46d5d60f4c9ec0c74e38c1c793815ff19d7786d7 --- ...django-1.10-openstack_dashboard.test.settings.patch | 10 ++++++++-- xenial/debian/patches/series | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xenial/debian/patches/django-1.10-openstack_dashboard.test.settings.patch b/xenial/debian/patches/django-1.10-openstack_dashboard.test.settings.patch index a996f06..21486be 100644 --- a/xenial/debian/patches/django-1.10-openstack_dashboard.test.settings.patch +++ b/xenial/debian/patches/django-1.10-openstack_dashboard.test.settings.patch @@ -5,7 +5,7 @@ Last-Update: 2016-07-21 --- horizon-10.0.0~b2.orig/openstack_dashboard/test/settings.py +++ horizon-10.0.0~b2/openstack_dashboard/test/settings.py -@@ -242,3 +242,23 @@ REST_API_SETTING_2 = 'bar' +@@ -242,3 +242,29 @@ REST_API_SETTING_2 = 'bar' REST_API_SECURITY = 'SECURITY' REST_API_REQUIRED_SETTINGS = ['REST_API_SETTING_1'] REST_API_ADDITIONAL_SETTINGS = ['REST_API_SETTING_2'] @@ -13,7 +13,6 @@ Last-Update: 2016-07-21 +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', -+ 'APP_DIRS': True, + 'DIRS': [os.path.join(TEST_DIR, 'templates'), ], + 'OPTIONS': { + 'context_processors': [ @@ -26,6 +25,13 @@ Last-Update: 2016-07-21 + 'horizon.context_processors.horizon', + 'openstack_dashboard.context_processors.openstack', + ], ++ 'loaders': [ ++ 'django.template.loaders.filesystem.Loader', ++ 'django.template.loaders.app_directories.Loader', ++ 'django.template.loaders.cached.Loader', ++ 'horizon.themes.ThemeTemplateLoader', ++ 'horizon.loaders.TemplateLoader', ++ ], + }, + }, +] diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 8864fe2..5b122d7 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -5,6 +5,6 @@ BaseCommand.option_list-is-gone-from-django1.10.patch 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-do-not-use-django.template.Context-function.patch django-1.10-horizon.test.settings.patch +django-1.10-openstack_dashboard.test.settings.patch -- 2.45.2