Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for direct deletion of slide from admin account #369

Merged
merged 33 commits into from
Apr 15, 2020
Merged

Fix for direct deletion of slide from admin account #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
048c569
Fixed typo for return
Vedant1202 Apr 5, 2020
61661f6
merge fix
Vedant1202 Apr 7, 2020
85c4997
Fix for refresh during first slide upload
Vedant1202 Apr 7, 2020
6979fa8
Fixed refresh on first slide upload
Vedant1202 Apr 7, 2020
50b2cc8
Added space after 'if' for eslint configuration
Vedant1202 Apr 7, 2020
1e94b81
Added functionality to delete slide from system
Vedant1202 Apr 7, 2020
8f1c7f6
Merge branch 'develop' of https://github.com/Vedant1202/caMicroscope …
Vedant1202 Apr 7, 2020
31460c7
Removed refresh on first slide upload
Vedant1202 Apr 7, 2020
9f2438a
Added alert for slide deletion success
Vedant1202 Apr 7, 2020
e8bbcd8
Update to fix linting errors
Vedant1202 Apr 7, 2020
b0cef11
Update to fix linting errors
Vedant1202 Apr 7, 2020
4e2bf41
Fix linting errors
Vedant1202 Apr 7, 2020
37fd15c
Fix lint errors
Vedant1202 Apr 7, 2020
7bbc144
Fix lint error
Vedant1202 Apr 7, 2020
27b5299
Rechained promises to handle mishandled slide deletions
Vedant1202 Apr 8, 2020
8477ee6
Merge fix
Vedant1202 Apr 8, 2020
2d805a8
Merge fix
Vedant1202 Apr 8, 2020
3411a5d
style fix
birm Apr 11, 2020
be0480c
Added delete slide request functionality
Vedant1202 Apr 11, 2020
59cc361
Merge branch 'develop' of https://github.com/camicroscope/caMicroscop…
Vedant1202 Apr 11, 2020
0c9e74d
merge fix
Vedant1202 Apr 11, 2020
31763f3
style fix
Vedant1202 Apr 11, 2020
51f6552
style fix
Vedant1202 Apr 11, 2020
554e5c5
style fix
Vedant1202 Apr 11, 2020
0ce49cc
style fix
Vedant1202 Apr 11, 2020
2055317
style fix
Vedant1202 Apr 11, 2020
b5082cc
Merge branch 'develop' into develop
Vedant1202 Apr 12, 2020
a51c0a2
Client side changes for handling new 'requests' collection
Vedant1202 Apr 12, 2020
0f67e0a
merge fix
Vedant1202 Apr 15, 2020
0157d35
merge fix
Vedant1202 Apr 15, 2020
9470c65
merge fix
Vedant1202 Apr 15, 2020
07c0c0c
Fix for direct deletion of slides
Vedant1202 Apr 15, 2020
b1689c4
style fix
Vedant1202 Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/loader/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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'),
);
Expand Down
1 change: 0 additions & 1 deletion apps/table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down