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

Web:Client: fix after merge

Browse Source
This commit is contained in:
Timofey Boyko 2022-12-16 20:42:11 +03:00
parent 7bc819dba7
commit 00afcfc4fa
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/store/ContextOptionsStore.js
View File

@ -236,12 +236,14 @@ class ContextOptionsStore {
return toastr.success(t("Translations:LinkCopySuccess"));
}
const { canConvert, isMediaOrImage } = this.settingsStore;
const { canConvert } = this.settingsStore;
const { getItemUrl } = this.filesStore;
const needConvert = canConvert(item.fileExst);
const canOpenPlayer = isMediaOrImage(item.fileExst);
const canOpenPlayer =
item.viewAccessability?.ImageView || item.viewAccessability?.MediaView;
const url = getItemUrl(
item.id,

7
packages/client/src/store/FilesStore.js
View File

@ -1370,10 +1370,7 @@ class FilesStore {
// }
if (!isRecycleBinFolder)
fileOptions = this.removeOptions(fileOptions, [
"restore",
"link-for-room-members",
]);
fileOptions = this.removeOptions(fileOptions, ["restore"]);
if (enablePlugins && !isRecycleBinFolder) {
const pluginFilesKeys = getContextMenuKeysByType(
@ -1407,7 +1404,7 @@ class FilesStore {
fileOptions = this.removeOptions(fileOptions, ["open-location"]);
}
if (isMyFolder) {
if (isMyFolder || isRecycleBinFolder) {
fileOptions = this.removeOptions(fileOptions, [
"link-for-room-members",
]);