matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

Apply PR feedback, don't change room to go to its settings

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2019-02-25 23:08:51 +00:00
parent 393fd26a42
commit d4b6ce6932
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/context_menus/RoomTileContextMenu.js
View File

@@ -273,10 +273,9 @@ module.exports = React.createClass({
_onClickSettings: function() {
dis.dispatch({
action: 'view_room',
action: 'open_room_settings',
room_id: this.props.room.roomId,
}, true);
dis.dispatch({ action: 'open_room_settings' });
});
if (this.props.onFinished) {
this.props.onFinished();
}
@@ -373,8 +372,9 @@ module.exports = React.createClass({
// Can't set notif level or tags on non-join rooms
if (myMembership !== 'join') {
return <div>
{ this._renderSettingsMenu() }
{ this._renderLeaveMenu(myMembership) }
<hr className="mx_RoomTileContextMenu_separator" />
{ this._renderSettingsMenu() }
</div>;
}
@@ -382,10 +382,11 @@ module.exports = React.createClass({
<div>
{ this._renderNotifMenu() }
<hr className="mx_RoomTileContextMenu_separator" />
{ this._renderSettingsMenu() }
{ this._renderLeaveMenu(myMembership) }
<hr className="mx_RoomTileContextMenu_separator" />
{ this._renderRoomTagMenu() }
<hr className="mx_RoomTileContextMenu_separator" />
{ this._renderSettingsMenu() }
</div>
);
},

6
src/components/views/dialogs/RoomSettingsDialog.js
View File

@@ -23,6 +23,7 @@ import RolesRoomSettingsTab from "../settings/tabs/RolesRoomSettingsTab";
import GeneralRoomSettingsTab from "../settings/tabs/GeneralRoomSettingsTab";
import SecurityRoomSettingsTab from "../settings/tabs/SecurityRoomSettingsTab";
import sdk from "../../../index";
import MatrixClientPeg from "../../../MatrixClientPeg";
export default class RoomSettingsDialog extends React.Component {
static propTypes = {
@@ -60,9 +61,12 @@ export default class RoomSettingsDialog extends React.Component {
render() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const room = MatrixClientPeg.get().getRoom(this.props.roomId);
const title = _t("Room Settings") + ' - ' + room.name;
return (
<BaseDialog className='mx_RoomSettingsDialog' hasCancel={true}
onFinished={this.props.onFinished} title={_t("Room Settings")}>
onFinished={this.props.onFinished} title={title}>
<div className='ms_SettingsDialog_content'>
<TabbedView tabs={this._getTabs()} />
</div>