Fix for direct deletion of slide from admin account (#369)

* Fixed typo for return * Fix for refresh during first slide upload * Fixed refresh on first slide upload * Added space after 'if' for eslint configuration * Added functionality to delete slide from system * Removed refresh on first slide upload * Added alert for slide deletion success * Update to fix linting errors * Update to fix linting errors * Fix linting errors * Fix lint errors * Fix lint error * Rechained promises to handle mishandled slide deletions * style fix * Added delete slide request functionality * style fix * style fix * style fix * style fix * style fix * Client side changes for handling new 'requests' collection * merge fix * merge fix * Fix for direct deletion of slides * style fix Co-authored-by: Ryan Birmingham <birm@rbirm.us>
camicroscope · Apr 15, 2020 · b26c127 · b26c127
1 parent e5e7d36
commit b26c127
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/apps/loader/loader.js b/apps/loader/loader.js
@@ -240,7 +240,7 @@ function PostBtn() {
   handlePost(filename, slidename, filter, true);
 }
 
-function deleteSlideFromSystem(id, filename, reqId) {
+function deleteSlideFromSystem(id, filename, reqId=null) {
   // var data = new FormData();
   // data.append('filename', filename);
   data = {
@@ -260,9 +260,11 @@ function deleteSlideFromSystem(id, filename, reqId) {
         if (data.success) {
         // return true;
           store.deleteSlide(id)
-              .then(
-                  store.cancelRequestToDeleteSlide(requestId=reqId, onlyRequestCancel=false),
-              )
+              .then(function() {
+                if (reqId) {
+                  store.cancelRequestToDeleteSlide(requestId=reqId, onlyRequestCancel=false);
+                }
+              })
               .then(
                   alert('File deleted successfully'),
               );

diff --git a/apps/table.html b/apps/table.html
@@ -614,7 +614,6 @@ <h3 class="text-center h3 mb-0">Available Slides</h3>
 					var upordown = parseInt($(this)[0].id[4]);
 					var index = HeadMapping.findIndex((a)=> a.title.toLowerCase() == value.toLowerCase());
 
-
 					var trs = "#datatables tbody tr";
 					if(searching){
 						trs+= ".searched";