[#4801] Don't import stuff from the old controllers

ckan · Nov 28, 2019 · 5a6e7ad · 5a6e7ad
1 parent 9851dd3
commit 5a6e7ad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/ckan/views/admin.py b/ckan/views/admin.py
@@ -2,7 +2,7 @@
 
 import logging
 
-from ckan.controllers.home import CACHE_PARAMETERS
+from ckan.views.home import CACHE_PARAMETERS
 from flask import Blueprint
 from flask.views import MethodView
 

diff --git a/ckan/views/dataset.py b/ckan/views/dataset.py
@@ -19,7 +19,7 @@
 import ckan.model as model
 import ckan.plugins as plugins
 from ckan.common import _, config, g, request
-from ckan.controllers.home import CACHE_PARAMETERS
+from ckan.views.home import CACHE_PARAMETERS
 from ckan.lib.plugins import lookup_package_plugin
 from ckan.lib.render import TemplateNotFound
 from ckan.lib.search import SearchError, SearchQueryError, SearchIndexError

diff --git a/ckan/views/home.py b/ckan/views/home.py
@@ -10,6 +10,9 @@
 
 from ckan.common import g, config, _
 
+CACHE_PARAMETERS = ['__cache', '__no_cache__']
+
+
 home = Blueprint(u'home', __name__)
 
 

diff --git a/ckan/views/resource.py b/ckan/views/resource.py
@@ -16,7 +16,7 @@
 import ckan.model as model
 import ckan.plugins as plugins
 from ckan.common import _, g, request
-from ckan.controllers.home import CACHE_PARAMETERS
+from ckan.views.home import CACHE_PARAMETERS
 from ckan.views.dataset import (
     _get_pkg_template, _get_package_type, _setup_template_variables
 )