Merge pull request #13 from Cadasta/delete-fixes

Delete fixes
Cadasta · Oct 5, 2016 · 9aa9ea1 · 9aa9ea1
2 parents 8e64da1 + 8dfe86a
commit 9aa9ea1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/buckets/__init__.py b/buckets/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.17'
+__version__ = '0.1.18'
diff --git a/buckets/static/buckets/js/script.js b/buckets/static/buckets/js/script.js
@@ -156,11 +156,15 @@
         e.preventDefault();
 
         var el = e.target.parentElement.parentElement;
-        var url = el.getAttribute('data-upload-to') + '/' + el.querySelector('.file-link').innerHTML,
-            headers  = { // 'content-type': 'application/json',
-                        'X-CSRFToken': getCookie('csrftoken')},
+        var urlArray = el.querySelector('.file-url').value.split('/'),
+            headers  = { 'X-CSRFToken': getCookie('csrftoken')},
             form = new FormData();
-            form.append('key', url);
+
+        var url = urlArray[urlArray.length - 1];
+        if (el.getAttribute('data-upload-to').length) {
+            url = el.getAttribute('data-upload-to') + '/' + url;
+        }
+        form.append('key', url);
 
         request('POST', '/s3/delete-resource/', form, headers, null, function() {
             el.querySelector('.file-url').value = '';