From 9078735669b5a930d63b51bc4772b015097da2e8 Mon Sep 17 00:00:00 2001
From: Matthias Held <ilovemilk@wusa.io>
Date: Thu, 30 Aug 2018 17:53:02 +0200
Subject: Fix single file recovery

---
 js/filelist.js | 6 ++++++
 js/scan.js     | 9 ++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/filelist.js b/js/filelist.js
index b357ad6..1165dfc 100644
--- a/js/filelist.js
+++ b/js/filelist.js
@@ -196,6 +196,7 @@
             var self = this;
             var sequence = $(e.target).parent().data('sequence');
             var numberOfFiles = Object.keys(this.files[sequence]).length;
+            var $tr = $(e.target).closest('tr');
 
             console.log("Recover files from sequence " + sequence + " with " + numberOfFiles + " files.");
 
@@ -213,6 +214,7 @@
                             console.log(response['id']);
                             self.$el.find("tr[data-id='" + response['id'] + "']").remove();
                             numberOfFiles = numberOfFiles - 1;
+                            delete self._selectedFiles[index];
                             if (numberOfFiles === 0) {
                                 self.$section[sequence].remove();
                                 delete self.$section[sequence];
@@ -221,6 +223,10 @@
                                     self.$el.append(self._createNoSequenceFound());
                                 }
                             }
+                            if (Object.keys(self._selectedFiles).length === 0) {
+                                OC.dialogs.alert(t('ransomware_detection', 'All files successfully recovered.'), t('ransomware_detection', 'Success'));
+                            }
+                			self.updateSelectionSummary();
                         }).fail(function(response, code) {
                             console.log("Recovery failed.");
                         });
diff --git a/js/scan.js b/js/scan.js
index e150647..5b66a24 100644
--- a/js/scan.js
+++ b/js/scan.js
@@ -167,8 +167,8 @@
         _onClickRecover: function(e) {
             var self = this;
 
-            var numberOfFiles = Object.keys(self._selectedFiles).length;
             var sequence = $(e.target).parent().data('sequence');
+            var numberOfFiles = Object.keys(self.files[sequence]).length;
 
             OC.dialogs.confirm(t('ransomware_detection', 'Are your sure you want to recover the selected files?'), t('ransomware_detection', 'Confirmation'), function (e) {
                 if (e === true) {
@@ -186,10 +186,9 @@
                             if (numberOfFiles === 0) {
                                 self.$section[sequence].remove();
                                 delete self.$section[sequence];
-                                if (Object.keys(self._selectedFiles).length === 0) {
-                                    OC.dialogs.alert(t('ransomware_detection', 'All files successfully recovered.'), t('ransomware_detection', 'Success'));
-                                    //self.$el.append(self._createAllFilesRecovered());
-                                }
+                            }
+                            if (Object.keys(self._selectedFiles).length === 0) {
+                                OC.dialogs.alert(t('ransomware_detection', 'All files successfully recovered.'), t('ransomware_detection', 'Success'));
                             }
                             self.updateSelectionSummary(sequence);
                         }).fail(function(response, code) {
-- 
cgit v1.2.3