From cdadf514cb74c14bc0fdc3b29bf40cf62e8e52bb Mon Sep 17 00:00:00 2001
From: zxj96 <519213124@qq.com>
Date: Mon, 10 Jun 2019 18:23:21 +0800
Subject: [PATCH 1/2] Delete direct download link
---
frontend/src/components/dialog/generate-share-link.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/dialog/generate-share-link.js b/frontend/src/components/dialog/generate-share-link.js
index c37b433424..1c8170f2fa 100644
--- a/frontend/src/components/dialog/generate-share-link.js
+++ b/frontend/src/components/dialog/generate-share-link.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import moment from 'moment';
import copy from 'copy-to-clipboard';
import { Button, Form, FormGroup, Label, Input, InputGroup, InputGroupAddon, Alert } from 'reactstrap';
-import { gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkPasswordMinLength } from '../../utils/constants';
+import { gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkPasswordMinLength, canDownload } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils';
import SharedLinkInfo from '../../models/shared-link-info';
@@ -307,7 +307,7 @@ class GenerateShareLink extends React.Component {
}
- {!sharedLinkInfo.is_dir && ( //just for file
+ {!sharedLinkInfo.is_dir && canDownload && ( //just for file
{gettext('Direct Download Link:')}
From 7bcd4e7616ae366ec1831958a8834df9b0e59917 Mon Sep 17 00:00:00 2001
From: zxj96 <519213124@qq.com>
Date: Tue, 11 Jun 2019 09:34:11 +0800
Subject: [PATCH 2/2] Determine whether the hidden link is hidden by the
permission of the generated link
---
frontend/src/components/dialog/generate-share-link.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/dialog/generate-share-link.js b/frontend/src/components/dialog/generate-share-link.js
index 1c8170f2fa..78a5bc5557 100644
--- a/frontend/src/components/dialog/generate-share-link.js
+++ b/frontend/src/components/dialog/generate-share-link.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import moment from 'moment';
import copy from 'copy-to-clipboard';
import { Button, Form, FormGroup, Label, Input, InputGroup, InputGroupAddon, Alert } from 'reactstrap';
-import { gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkPasswordMinLength, canDownload } from '../../utils/constants';
+import { gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkPasswordMinLength } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils';
import SharedLinkInfo from '../../models/shared-link-info';
@@ -307,7 +307,7 @@ class GenerateShareLink extends React.Component {
}
- {!sharedLinkInfo.is_dir && canDownload && ( //just for file
+ {!sharedLinkInfo.is_dir && sharedLinkInfo.permissions.can_download &&( //just for file
{gettext('Direct Download Link:')}