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

2018-04-06 14:55:36 +00:00 · 2018-04-06 14:55:36 +00:00 · 9b11f2deaa
parent d1c7187db0 666f419dfd
commit 9b11f2deaa
1 changed files with 4 additions and 1 deletions
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@ -549,7 +549,10 @@ export default React.createClass({
            editing: true,
            profileForm: Object.assign({}, this.state.summary.profile),
            joinableForm: {
-                policyType: this.state.summary.profile.join_policy,
+                policyType:
+                    this.state.summary.profile.is_openly_joinable ?
+                        GROUP_JOINPOLICY_OPEN :
+                        GROUP_JOINPOLICY_INVITE,
            },
        });
        dis.dispatch({