Merge remote-tracking branch 'origin/develop' into develop

2017-10-26 13:52:20 +00:00 · 2017-10-26 13:52:20 +00:00 · bd8097e44c
parent c5c74749b7 c8a489ca77
commit bd8097e44c
1 changed files with 9 additions and 7 deletions
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@ -964,6 +964,7 @@ export default React.createClass({
                    </AccessibleButton>,
                );
            } else {
+                if (summary.user && summary.user.membership === 'join') {
                    rightButtons.push(
                        <AccessibleButton className="mx_GroupHeader_button"
                            onClick={this._onEditClick} title={_t("Community Settings")} key="_editButton"
@ -971,6 +972,7 @@ export default React.createClass({
                            <TintableSvg src="img/icons-settings-room.svg" width="16" height="16" />
                        </AccessibleButton>,
                    );
+                }
                if (this.props.collapsedRhs) {
                    rightButtons.push(
                        <AccessibleButton className="mx_GroupHeader_button"