cancelDownloads

oml/item/api.py

@@ -169,22 +169,23 @@ def download(request):
 actions.register(download, cache=False)
 
 @returns_json
-def cancelDownload(request):
+def cancelDownloads(request):
     response = {}
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    item = models.Item.get(data['id'])
+    ids = data['ids']
-    if item:
+    if ids:
-        item.transferprogress = None
+        for item in models.Item.query.filter(models.Item.id.in_(ids)):
-        item.transferadded = None
+            item.transferprogress = None
-        p = state.user()
+            item.transferadded = None
-        if p in item.users:
+            p = state.user()
-            item.users.remove(p)
+            if p in item.users:
-        for l in item.lists.filter_by(user_id=settings.USER_ID):
+                item.users.remove(p)
-            l.remove(item)
+            for l in item.lists.filter_by(user_id=settings.USER_ID):
-        item.update()
+                l.remove(item)
+            item.update()
         response = {'status': 'cancelled'}
     return response
-actions.register(cancelDownload, cache=False)
+actions.register(cancelDownloads, cache=False)
 
 @returns_json
 def scan(request):

oml/node/nodeapi.py

@@ -99,6 +99,5 @@ def api_cancelPeering(app, user_id, message):
         user.info['message'] = message
         user.update_peering(False)
         trigger_event('peering', user.json())
-        user.peered = False
         return True
     return False

static/js/transfersDialog.js

@@ -65,7 +65,12 @@ oml.ui.transfersDialog = function() {
             })
             .bindEvent({
                 click: function() {
-                    // ...
+                    var ids = $list.options('selected');
+                    ids && ids.length && oml.api.cancelDownloads({
+                        ids: ids
+                    }, function() {
+                        $list.reloadList(true);
+                    });
                 }
             })
             .appendTo($item),
@@ -122,4 +127,4 @@ oml.ui.transfersDialog = function() {
 
     return that;
     
-};
+};