haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

Share link file upload (#4633)

Browse Source 
* [share dialog] fixed permission bugs; added 'download and upload'
permission

* share link: fixed permission bug for library
* upload link: fixed permission bug
* share link: added 'download and upload' permission for folder

* [folder share link] added 'file upload' for folder share link with 'can_upload' permission
This commit is contained in:
llj
2020-10-20 16:24:58 +08:00
committed by GitHub
parent 25cee90eda
commit 7000c1f364
11 changed files with 1107 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/dialog/generate-share-link.js
View File

@@ -83,8 +83,9 @@ class GenerateShareLink extends React.Component {
});
if (isPro) {
if (this.props.itemType === 'library') {
let permissionOptions = Utils.getShareLinkPermissionList(this.props.itemType, '', path);
const { itemType, userPerm } = this.props;
if (itemType == 'library') {
let permissionOptions = Utils.getShareLinkPermissionList(itemType, userPerm, path);
this.setState({
permissionOptions: permissionOptions,
currentPermission: permissionOptions[0],

5
frontend/src/components/dialog/share-dialog.js
View File

@@ -54,7 +54,7 @@ class ShareDialog extends React.Component {
getInitialActiveTab = () => {
let { repoEncrypted, userPerm, enableDirPrivateShare, itemType } = this.props;
const enableShareLink = !repoEncrypted && canGenerateShareLink;
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw';
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && (userPerm == 'rw' || userPerm == 'admin');
// for encrypted repo, 'dir private share' is only enabled for the repo itself,
// not for the folders in it.
@@ -88,7 +88,7 @@ class ShareDialog extends React.Component {
let activeTab = this.state.activeTab;
let { repoEncrypted, userPerm, enableDirPrivateShare, itemType } = this.props;
const enableShareLink = !repoEncrypted && canGenerateShareLink;
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw';
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && (userPerm == 'rw' || userPerm == 'admin');
// for encrypted repo, 'dir private share' is only enabled for the repo itself,
// not for the folders in it.
@@ -160,6 +160,7 @@ class ShareDialog extends React.Component {
repoID={this.props.repoID}
closeShareDialog={this.props.toggleDialog}
itemType={itemType}
userPerm={userPerm}
/>
</TabPane>
}