mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into luke/allow-guest-view-group

Browse source
This commit is contained in:
Luke Barnard 2017-11-28 14:06:43 +00:00 committed by GitHub
commit 55b5f2b249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/MatrixChat.js
View file

@ -81,7 +81,7 @@ const ONBOARDING_FLOW_STARTERS = [
'view_user_settings', 'view_user_settings',
'view_create_chat', 'view_create_chat',
'view_create_room', 'view_create_room',
'view_my_groups', 'view_create_group',
]; ];
module.exports = React.createClass({ module.exports = React.createClass({
@ -500,6 +500,11 @@ module.exports = React.createClass({
case 'view_create_room': case 'view_create_room':
this._createRoom(); this._createRoom();
break; break;
case 'view_create_group': {
const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
}
break;
case 'view_room_directory': case 'view_room_directory':
this._setPage(PageTypes.RoomDirectory); this._setPage(PageTypes.RoomDirectory);
this.notifyNewScreen('directory'); this.notifyNewScreen('directory');

10
src/components/structures/MyGroups.js
View file

@ -18,9 +18,9 @@ import React from 'react';
import GeminiScrollbar from 'react-gemini-scrollbar'; import GeminiScrollbar from 'react-gemini-scrollbar';
import sdk from '../../index'; import sdk from '../../index';
import { _t } from '../../languageHandler'; import { _t } from '../../languageHandler';
import dis from '../../dispatcher';
import withMatrixClient from '../../wrappers/withMatrixClient'; import withMatrixClient from '../../wrappers/withMatrixClient';
import AccessibleButton from '../views/elements/AccessibleButton'; import AccessibleButton from '../views/elements/AccessibleButton';
import Modal from '../../Modal';
export default withMatrixClient(React.createClass({ export default withMatrixClient(React.createClass({
displayName: 'MyGroups', displayName: 'MyGroups',
@ -41,14 +41,18 @@ export default withMatrixClient(React.createClass({
}, },
_onCreateGroupClick: function() { _onCreateGroupClick: function() {
const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog"); dis.dispatch({action: 'view_create_group'});
Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
}, },
_fetch: function() { _fetch: function() {
this.props.matrixClient.getJoinedGroups().done((result) => { this.props.matrixClient.getJoinedGroups().done((result) => {
this.setState({groups: result.groups, error: null}); this.setState({groups: result.groups, error: null});
}, (err) => { }, (err) => {
if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
// Indicate that the guest isn't in any groups (which should be true)
this.setState({groups: [], error: null});
return;
}
this.setState({groups: null, error: err}); this.setState({groups: null, error: err});
}); });
}, },