haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-07-22 17:09:10 +08:00
parent fc56ae5cec 70323a7365
commit af74f8b30b
35 changed files with 583 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dialog/org-logs-file-update-detail.js
View File

@@ -41,7 +41,7 @@ class FileUpdateDetailDialog extends React.Component {
}).catch(error => {
let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage);
})
});
}
renderContentItem = (items) => {

2
frontend/src/components/dialog/share-to-group.js
View File

@@ -111,7 +111,7 @@ class ShareToGroup extends React.Component {
sharedItems: []
};
this.options = [];
this.permissions = []
this.permissions = [];
let { itemType, isRepoOwner } = props;
if (itemType === 'library') {
this.permissions = isRepoOwner ? ['rw', 'r', 'admin', 'cloud-edit', 'preview'] : ['rw', 'r', 'cloud-edit', 'preview'];