From c7638e31d6bcf547a6c754807424469991294a28 Mon Sep 17 00:00:00 2001
From: Yan <yan.rudenko@linkdigital.com.au>
Date: Tue, 29 Nov 2016 10:01:51 +0200
Subject: [PATCH] OEHXCDHG-171 GA now uses CloudStorage resource_download
 method, if it's presents in Ckan plugin list

---
 ckanext/googleanalytics/controller.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ckanext/googleanalytics/controller.py b/ckanext/googleanalytics/controller.py
index 69effef..2f01fb1 100644
--- a/ckanext/googleanalytics/controller.py
+++ b/ckanext/googleanalytics/controller.py
@@ -16,6 +16,10 @@ from paste.util.multidict import MultiDict
 
 from ckan.controllers.api import ApiController
 from ckan.controllers.package import PackageController
+from ckan.common import g
+if 'cloudstorage' in g.plugins:
+    is_using_cloudstorage = True
+    from ckanext.cloudstorage.controller import StorageController
 
 log = logging.getLogger('ckanext.googleanalytics')
 
@@ -148,5 +152,13 @@ class GAResourceController(PackageController):
 
     def resource_download(self, id, resource_id, filename=None):
         self._post_analytics(c.user, "Resource", "Download", resource_id, id)
-        return PackageController.resource_download(self, id, resource_id,
-                                                   filename)
+
+        if is_using_cloudstorage:
+            use_controller = StorageController
+            use_class = StorageController()
+        else:
+            use_controller = PackageController
+            use_class = PackageController()
+
+        return use_controller.resource_download(use_class,id, resource_id,
+                                               filename)