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

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Ilya Oleshko 2022-06-21 16:27:49 +03:00
commit 2a20a8ceaa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
products/ASC.Files/Client/src/HOCs/withContent.js
View File

@ -258,6 +258,7 @@ export default function withContent(WrappedContent) {
const folderIds = [+itemId]; const folderIds = [+itemId];
createdFolderId && folderIds.push(createdFolderId); createdFolderId && folderIds.push(createdFolderId);
setIsUpdatingRowItem(false);
clearActiveOperations(null, folderIds); clearActiveOperations(null, folderIds);
return setIsLoading(false); return setIsLoading(false);
@ -286,7 +287,6 @@ export default function withContent(WrappedContent) {
t("Translations:FileProtected"), t("Translations:FileProtected"),
t("Common:Warning") t("Common:Warning")
); );
setIsUpdatingRowItem(false);
setFormCreationInfo({ setFormCreationInfo({
newTitle: `${title}.${item.fileExst}`, newTitle: `${title}.${item.fileExst}`,
@ -308,6 +308,7 @@ export default function withContent(WrappedContent) {
const fileIds = [+itemId]; const fileIds = [+itemId];
createdFileId && fileIds.push(createdFileId); createdFileId && fileIds.push(createdFileId);
setIsUpdatingRowItem(false);
clearActiveOperations(fileIds); clearActiveOperations(fileIds);
return setIsLoading(false); return setIsLoading(false);
@ -336,6 +337,7 @@ export default function withContent(WrappedContent) {
const fileIds = [+itemId]; const fileIds = [+itemId];
createdFileId && fileIds.push(createdFileId); createdFileId && fileIds.push(createdFileId);
setIsUpdatingRowItem(false);
clearActiveOperations(fileIds); clearActiveOperations(fileIds);
return setIsLoading(false); return setIsLoading(false);
@ -373,6 +375,7 @@ export default function withContent(WrappedContent) {
const fileIds = [+itemId]; const fileIds = [+itemId];
createdFileId && fileIds.push(createdFileId); createdFileId && fileIds.push(createdFileId);
setIsUpdatingRowItem(false);
clearActiveOperations(fileIds); clearActiveOperations(fileIds);
return setIsLoading(false); return setIsLoading(false);

3
products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/SingleItem.js
View File

@ -167,6 +167,9 @@ const SingleItem = (props) => {
}, },
]; ];
if (item.providerKey && item.isFolder)
result = result.filter((x) => x.id !== "Size");
if (dontShowOwner) result.shift(); if (dontShowOwner) result.shift();
if (item.isFolder) return result; if (item.isFolder) return result;