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

This commit is contained in:
Tatiana Lopaeva 2022-12-08 15:49:50 +03:00
commit d354861c0c
2 changed files with 8 additions and 1 deletions

View File

@ -28,12 +28,14 @@ const CreateRoomEvent = ({
setCreateRoomDialogVisible,
fetchFiles,
setInfoPanelIsVisible,
setView,
}) => {
const { t } = useTranslation(["CreateEditRoomDialog", "Common", "Files"]);
const [fetchedTags, setFetchedTags] = useState([]);
const [isLoading, setIsLoading] = useState(false);
const openNewRoom = (id) => {
setView("info_members");
fetchFiles(id)
.then(() => {
setInfoPanelIsVisible(true);
@ -173,7 +175,10 @@ export default inject(
} = settingsStore.thirdPartyStore;
const { withPaging } = auth.settingsStore;
const { setIsVisible: setInfoPanelIsVisible } = auth.infoPanelStore;
const {
setIsVisible: setInfoPanelIsVisible,
setView,
} = auth.infoPanelStore;
return {
createRoom,
@ -195,6 +200,7 @@ export default inject(
setCreateRoomDialogVisible,
fetchFiles,
setInfoPanelIsVisible,
setView,
};
}
)(observer(CreateRoomEvent));

View File

@ -160,6 +160,7 @@ public class FileDtoHelper : FileEntryDtoHelper
result.CanFillForms = await _fileSecurity.CanFillFormsAsync(file);
result.DenyDownload = file.DenyDownload;
result.DenySharing = file.DenySharing;
result.Access = file.Access;
try
{