IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0

Browse Source
This commit is contained in:
Elyor Djalilov 2023-01-20 18:11:55 +05:00
commit a5062da2d2
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ASC.Core.Common/Context/SecurityContext.cs
View File

@ -135,7 +135,7 @@ public class SecurityContext
return false;
}
if (tenant != _tenantManager.GetCurrentTenant().Id)
{
return false;
@ -161,9 +161,9 @@ public class SecurityContext
return false;
}
var loginEventById = await _dbLoginEventsManager.GetById(loginEventId);
if (loginEventById == null)
var loginEventById = await _dbLoginEventsManager.GetById(loginEventId);
if (loginEventById == null || !loginEventById.Active)
{
return false;
}

2
packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
View File

@ -196,7 +196,7 @@ const InviteInput = ({
};
const closeInviteInputPanel = (e) => {
if (e?.target.tagName.toUpperCase() == "INPUT") return;
// if (e?.target.tagName.toUpperCase() == "INPUT") return;
setSearchPanelVisible(false);
};

12
packages/client/src/store/FilesActionsStore.js
View File

@ -967,6 +967,7 @@ class FilesActionStore {
switch (action) {
case "archive":
this.setGroupMenuBlocked(true);
return moveToFolder(archiveRoomsId, items)
.then(async (res) => {
const lastResult = res && res[res.length - 1];
@ -1022,8 +1023,12 @@ class FilesActionStore {
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
return toastr.error(err.message ? err.message : err);
})
.finally(() => clearActiveOperations(null, items));
.finally(() => {
clearActiveOperations(null, items);
this.setGroupMenuBlocked(false);
});
case "unarchive":
this.setGroupMenuBlocked(true);
return moveToFolder(myRoomsId, items)
.then(async (res) => {
const lastResult = res && res[res.length - 1];
@ -1062,7 +1067,10 @@ class FilesActionStore {
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
return toastr.error(err.message ? err.message : err);
})
.finally(() => clearActiveOperations(null, items));
.finally(() => {
clearActiveOperations(null, items);
this.setGroupMenuBlocked(false);
});
default:
return;
}