Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0
This commit is contained in:
commit
d8a11dad31
@ -195,11 +195,12 @@ class ThirdPartyServices extends React.Component {
|
|||||||
|
|
||||||
const filteredConsumers = consumers.filter(
|
const filteredConsumers = consumers.filter(
|
||||||
(consumer) =>
|
(consumer) =>
|
||||||
consumer.title !== "Bitly" &&
|
consumer.name !== "bitly" &&
|
||||||
consumer.title !== "WordPress" &&
|
consumer.name !== "wordpress" &&
|
||||||
consumer.title !== "DocuSign" &&
|
consumer.name !== "docusign" &&
|
||||||
consumer.name !== "clickatell" && //TODO: hide while 2fa by sms is not working
|
consumer.name !== "clickatell" && //TODO: hide while 2fa by sms is not working
|
||||||
consumer.name !== "twilio",
|
consumer.name !== "twilio" &&
|
||||||
|
consumer.name !== "selectel",
|
||||||
);
|
);
|
||||||
|
|
||||||
const freeConsumers = filteredConsumers.filter(
|
const freeConsumers = filteredConsumers.filter(
|
||||||
|
@ -356,6 +356,8 @@ class ContextOptionsStore {
|
|||||||
const { shared, navigationPath, canCopyPublicLink } =
|
const { shared, navigationPath, canCopyPublicLink } =
|
||||||
this.selectedFolderStore;
|
this.selectedFolderStore;
|
||||||
|
|
||||||
|
const isArchive = item.rootFolderType === FolderType.Archive;
|
||||||
|
|
||||||
const { href } = item;
|
const { href } = item;
|
||||||
const sharedItem = navigationPath.find((r) => r.shared);
|
const sharedItem = navigationPath.find((r) => r.shared);
|
||||||
|
|
||||||
@ -363,7 +365,7 @@ class ContextOptionsStore {
|
|||||||
(sharedItem && sharedItem.canCopyPublicLink) ||
|
(sharedItem && sharedItem.canCopyPublicLink) ||
|
||||||
(shared && canCopyPublicLink);
|
(shared && canCopyPublicLink);
|
||||||
|
|
||||||
if (isShared && !item.isFolder) {
|
if (isShared && !item.isFolder && !isArchive) {
|
||||||
const fileLinkData = await getFileLink(item.id);
|
const fileLinkData = await getFileLink(item.id);
|
||||||
copy(fileLinkData.sharedTo.shareLink);
|
copy(fileLinkData.sharedTo.shareLink);
|
||||||
return toastr.success(t("Translations:LinkCopySuccess"));
|
return toastr.success(t("Translations:LinkCopySuccess"));
|
||||||
|
Loading…
Reference in New Issue
Block a user