haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Shared with all (#2672)

Browse Source
This commit is contained in:
杨顺强
2018-12-21 15:40:59 +08:00
committed by Daniel Pan
parent aeeee79306
commit ac67f59081
16 changed files with 433 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View File

@@ -4,12 +4,13 @@ import moment from 'moment';
import { Dropdown, DropdownMenu, DropdownToggle, DropdownItem } from 'reactstrap';
import { Link } from '@reach/router';
import { Utils } from '../../utils/utils';
import { gettext, siteRoot, isPro, username, folderPermEnabled } from '../../utils/constants';
import { gettext, siteRoot, isPro, username, folderPermEnabled, isSystemStaff } from '../../utils/constants';
import ModalPotal from '../../components/modal-portal';
import ShareDialog from '../../components/dialog/share-dialog';
const propTypes = {
currentGroup: PropTypes.object,
libraryType: PropTypes.string,
repo: PropTypes.object.isRequired,
isItemFreezed: PropTypes.bool.isRequired,
onFreezedItem: PropTypes.func.isRequired,
@@ -152,7 +153,7 @@ class SharedRepoListItem extends React.Component {
generatorOperations = () => {
let { repo, currentGroup } = this.props;
//todo this have a bug; use current api is not return admins param;
let isStaff = currentGroup.admins && currentGroup.admins.indexOf(username) > -1; //for group repolist;
let isStaff = currentGroup && currentGroup.admins && currentGroup.admins.indexOf(username) > -1; //for group repolist;
let isRepoOwner = repo.owner_email === username;
let isAdmin = repo.is_admin;
let operations = [];
@@ -189,10 +190,18 @@ class SharedRepoListItem extends React.Component {
}
generatorMobileMenu = () => {
let operations = this.generatorOperations();
if (this.isDeparementOnwerGroupMember) {
operations.unshift('unshare');
operations.unshift('share');
let operations = [];
if (this.props.libraryType && this.props.libraryType === 'public') {
let isRepoOwner = this.props.repo.owner_email === username;
if (isSystemStaff || isRepoOwner) {
operations.push('unshare');
}
} else {
operations = this.generatorOperations();
if (this.isDeparementOnwerGroupMember) {
operations.unshift('unshare');
operations.unshift('share');
}
}
return (
<Dropdown isOpen={this.state.isItemMenuShow} toggle={this.toggleOperationMenu}>
@@ -219,9 +228,17 @@ class SharedRepoListItem extends React.Component {
}
generatorPCMenu = () => {
// scene one: (share, delete, itemToggle and other operations);
// scene two: (share, unshare), (share), (unshare)
let operations = this.generatorOperations();
let operations = [];
if (this.props.libraryType && this.props.libraryType === 'public') {
let isRepoOwner = this.props.repo.owner_email === username;
if (isSystemStaff || isRepoOwner) {
operations.push('unshare');
}
} else {
// scene one: (share, delete, itemToggle and other operations);
// scene two: (share, unshare), (share), (unshare)
operations = this.generatorOperations();
}
const shareOperation = <a href="#" className="sf2-icon-share sf2-x op-icon" title={gettext("Share")} onClick={this.onItemShare}></a>;
const unshareOperation = <a href="#" className="sf2-icon-x3 sf2-x op-icon" title={gettext("Unshare")} onClick={this.onItemUnshare}></a>
const deleteOperation = <a href="#" className="sf2-icon-delete sf2-x op-icon" title={gettext('Delete')} onClick={this.onItemDelete}></a>;

4
frontend/src/components/shared-repo-list-view/shared-repo-list-view.js
View File

@@ -4,9 +4,10 @@ import { gettext } from '../../utils/constants';
import SharedRepoListItem from './shared-repo-list-item';
const propTypes = {
libraryType: PropTypes.string,
currentGroup: PropTypes.object,
repoList: PropTypes.array.isRequired,
isShowTableThread: PropTypes.bool,
repoList: PropTypes.array.isRequired,
onItemUnshare: PropTypes.func.isRequired,
onItemDelete: PropTypes.func.isRequired,
};
@@ -34,6 +35,7 @@ class SharedRepoListView extends React.Component {
<SharedRepoListItem
key={repo.repo_id}
repo={repo}
libraryType={this.props.libraryType}
currentGroup={this.props.currentGroup}
isItemFreezed={this.state.isItemFreezed}
onFreezedItem={this.onFreezedItem}