toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

PLT-244/PLT-277 Made Delete Channel visibility always depend on policy setting (#771)

Browse source 
* PLT-274 Fixed navigator not being passed into ChannelInfo Markdown

* PLT-244/PLT-277 Changed Delete Channel visibility to always be based on policy settings
This commit is contained in:
Harrison Healey 2017-07-21 18:29:08 -04:00 committed by enahum
parent 5e0ca727a5
commit a5f10c7137
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/screens/channel_info/channel_info.js
View file

@ -233,6 +233,7 @@ class ChannelInfo extends PureComponent {
currentChannelCreatorName,
currentChannelMemberCount,
canManageUsers,
navigator,
status,
theme
} = this.props;
@ -264,6 +265,7 @@ class ChannelInfo extends PureComponent {
creator={currentChannelCreatorName}
displayName={currentChannel.display_name}
header={currentChannel.header}
navigator={navigator}
purpose={currentChannel.purpose}
status={status}
theme={theme}
@ -318,7 +320,7 @@ class ChannelInfo extends PureComponent {
/>
</View>
}
{this.renderLeaveOrDeleteChannelRow() && currentChannelMemberCount > 1 &&
{this.renderLeaveOrDeleteChannelRow() &&
<View>
<View style={style.separator}/>
<ChannelInfoRow

16
app/screens/channel_info/channel_info_header.js
View file

@ -23,6 +23,7 @@ export default class ChannelInfoHeader extends React.PureComponent {
memberCount: PropTypes.number,
displayName: PropTypes.string.isRequired,
header: PropTypes.string,
navigator: PropTypes.object.isRequired,
purpose: PropTypes.string,
status: PropTypes.string,
theme: PropTypes.object.isRequired,
@ -30,7 +31,18 @@ export default class ChannelInfoHeader extends React.PureComponent {
}
render() {
const {createAt, creator, displayName, header, memberCount, purpose, status, theme, type} = this.props;
const {
createAt,
creator,
displayName,
header,
memberCount,
navigator,
purpose,
status,
theme,
type
} = this.props;
const style = getStyleSheet(theme);
const textStyles = getMarkdownTextStyles(theme);
@ -63,6 +75,7 @@ export default class ChannelInfoHeader extends React.PureComponent {
defaultMessage='Purpose'
/>
<Markdown
navigator={navigator}
baseTextStyle={style.detail}
textStyles={textStyles}
blockStyles={blockStyles}
@ -78,6 +91,7 @@ export default class ChannelInfoHeader extends React.PureComponent {
defaultMessage='Header'
/>
<Markdown
navigator={navigator}
baseTextStyle={style.detail}
textStyles={textStyles}
blockStyles={blockStyles}