mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-04-12 15:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix add group bug

Browse Source
This commit is contained in:
suxiaoxin 2017-09-29 17:02:19 +08:00
parent d2c8391246
commit 81ec93e9ad
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/containers/Group/GroupList/GroupList.js
View File

@ -259,25 +259,26 @@ export default class GroupList extends Component {
let menu = <Menu>
{
this.props.curUserRole === "admin" ? (editmark) : ''
this.props.curUserRole === "admin" && this.props.currGroup.type!=='private' ? (editmark) : ''
}
{
this.props.curUserRole === "admin" || currGroup.role === 'owner' ? (delmark) : ''
(this.props.curUserRole === "admin" || currGroup.role === 'owner') && this.props.currGroup.type!=='private' ? (delmark) : ''
}
{
this.props.curUserRole === 'admin' ? (addmark) : ''
}
</Menu>;
menu = currGroup.role === 'owner' ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}>
menu = currGroup.role === 'owner' ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}>
<a className="ant-dropdown-link" href="#">
<Icon type="setting" />
</a>
</Dropdown>;
if( this.props.currGroup.type==='private'){
if(this.props.currGroup.type!=='private' && currGroup.role === 'owner'){
menu = null;
}
return (
<div className="m-group">
{!this.props.study ? <div className="study-mask"></div> : null}

2
server/models/group.js
View File

@ -13,7 +13,7 @@ class groupModel extends baseModel {
group_desc: String,
add_time: Number,
up_time: Number,
type: {type:String,default: 'private', enum: ['public', 'private']},
type: {type:String,default: 'public', enum: ['public', 'private']},
members: [
{
uid: Number,