diff --git a/client/containers/Group/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js index b4287510..0aa4098f 100755 --- a/client/containers/Group/GroupList/GroupList.js +++ b/client/containers/Group/GroupList/GroupList.js @@ -268,13 +268,13 @@ export default class GroupList extends Component { this.props.curUserRole === 'admin' ? (addmark) : '' } ; - menu = currGroup.role === 'owner' ? this.showModal(TYPE_EDIT)} /> : + menu = (currGroup.role === 'owner' && this.props.curUserRole !== 'admin') ? this.showModal(TYPE_EDIT)} /> : ; - if(this.props.currGroup.type!=='private' && currGroup.role === 'owner'){ + if(this.props.currGroup.type==='private' && currGroup.role === 'owner' && this.props.curUserRole !== 'admin'){ menu = null; } diff --git a/client/plugin-module.js b/client/plugin-module.js index 7c6d6c73..c3cbdea7 100644 --- a/client/plugin-module.js +++ b/client/plugin-module.js @@ -1 +1 @@ -module.exports = {} \ No newline at end of file +module.exports = {qsso : require('plugins/yapi-plugin-qsso/client.js')} \ No newline at end of file