ckan#16 / ga works with default uploader

gleb-rudenko · Feb 14, 2017 · b7238dc · b7238dc
1 parent 1165fdf
commit b7238dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ckanext/googleanalytics/controller.py b/ckanext/googleanalytics/controller.py
@@ -15,7 +15,6 @@
 from paste.util.multidict import MultiDict
 
 from ckan.controllers.api import ApiController
-from ckan.controllers.package import PackageController
 
 log = logging.getLogger('ckanext.googleanalytics')
 

diff --git a/ckanext/googleanalytics/plugin.py b/ckanext/googleanalytics/plugin.py
@@ -11,6 +11,7 @@
 import gasnippet
 from routes.mapper import SubMapper, Mapper as _Mapper
 from pylons import config
+from ckan.controllers.package import PackageController
 
 import urllib2
 import importlib
@@ -254,3 +255,7 @@ def modify_resource_download_route(self, map):
                 controller_class = getattr(module, route_controller[1])
                 controller_class.resource_download = post_analytics_decorator(
                     controller_class.resource_download)
+            else:
+                # If no custom uploader applied, use the default one
+                PackageController.resource_download = post_analytics_decorator(
+                    PackageController.resource_download)