Fix resource downloads to call IUploader plugins

ckan · May 26, 2016 · df4b05b · df4b05b
1 parent ed2196b
commit df4b05b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -1145,7 +1145,7 @@ def resource_download(self, id, resource_id, filename=None):
             abort(404, _('Resource not found'))
 
         if rsc.get('url_type') == 'upload':
-            upload = uploader.ResourceUpload(rsc)
+            upload = uploader.get_resource_uploader(rsc)
             filepath = upload.get_path(rsc['id'])
             fileapp = paste.fileapp.FileApp(filepath)
             try:

diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py
@@ -1492,7 +1492,7 @@ class IUploader(Interface):
     upload resources and group images.
     '''
 
-    def get_uploader(self):
+    def get_uploader(self, upload_to, old_filename):
         '''Return an uploader object to upload general files that must
         implement the following methods: