CKAN-Extensions
/
ckanext-googleanalytics
mirror of https://github.com/ckan/ckanext-googleanalytics.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from Engerrs/GA_fix_resource_download_method 

OEHXCDHG-171 GA now uses CloudStorage resource_download method, if it…
This commit is contained in:
Mark Gregson 2016-11-30 11:20:53 +11:00 committed by GitHub
parent 45d97159a7 c7638e31d6
commit 2bf48aed54
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ckanext/googleanalytics/controller.py
View File

@ -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)