Fixed Bug 60686 - Rooms. Fixed group action
This commit is contained in:
parent
e9b77f2f30
commit
66c9c81b0a
@ -967,6 +967,7 @@ class FilesActionStore {
|
|||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case "archive":
|
case "archive":
|
||||||
|
this.setGroupMenuBlocked(true);
|
||||||
return moveToFolder(archiveRoomsId, items)
|
return moveToFolder(archiveRoomsId, items)
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
const lastResult = res && res[res.length - 1];
|
const lastResult = res && res[res.length - 1];
|
||||||
@ -1022,8 +1023,12 @@ class FilesActionStore {
|
|||||||
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
|
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
|
||||||
return toastr.error(err.message ? err.message : err);
|
return toastr.error(err.message ? err.message : err);
|
||||||
})
|
})
|
||||||
.finally(() => clearActiveOperations(null, items));
|
.finally(() => {
|
||||||
|
clearActiveOperations(null, items);
|
||||||
|
this.setGroupMenuBlocked(false);
|
||||||
|
});
|
||||||
case "unarchive":
|
case "unarchive":
|
||||||
|
this.setGroupMenuBlocked(true);
|
||||||
return moveToFolder(myRoomsId, items)
|
return moveToFolder(myRoomsId, items)
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
const lastResult = res && res[res.length - 1];
|
const lastResult = res && res[res.length - 1];
|
||||||
@ -1062,7 +1067,10 @@ class FilesActionStore {
|
|||||||
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
|
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
|
||||||
return toastr.error(err.message ? err.message : err);
|
return toastr.error(err.message ? err.message : err);
|
||||||
})
|
})
|
||||||
.finally(() => clearActiveOperations(null, items));
|
.finally(() => {
|
||||||
|
clearActiveOperations(null, items);
|
||||||
|
this.setGroupMenuBlocked(false);
|
||||||
|
});
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user