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

Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

Browse Source
This commit is contained in:
zwjamnsss 2017-09-29 17:57:17 +08:00
commit 356822adaf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,13 +268,13 @@ export default class GroupList extends Component {
this.props.curUserRole === 'admin' ? (addmark) : '' this.props.curUserRole === 'admin' ? (addmark) : ''
} }
</Menu>; </Menu>;
menu = currGroup.role === 'owner' ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}> menu = (currGroup.role === 'owner' && this.props.curUserRole !== 'admin') ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}>
<a className="ant-dropdown-link" href="#"> <a className="ant-dropdown-link" href="#">
<Icon type="setting" /> <Icon type="setting" />
</a> </a>
</Dropdown>; </Dropdown>;
if(this.props.currGroup.type!=='private' && currGroup.role === 'owner'){ if(this.props.currGroup.type==='private' && currGroup.role === 'owner' && this.props.curUserRole !== 'admin'){
menu = null; menu = null;
} }

2
client/plugin-module.js
View File

@ -1 +1 @@
module.exports = {} module.exports = {qsso : require('plugins/yapi-plugin-qsso/client.js')}