Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-24086:Disable changing picture if LDAP sync'ed #5465

Merged
merged 7 commits into from
May 20, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add imageContext property back, still used.
  • Loading branch information
sbishel committed May 12, 2020
commit f6474a1df03edfa78d2c0f36ae32a91bd7e1d8ca
4 changes: 4 additions & 0 deletions components/setting_picture.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import OverlayTrigger from 'components/overlay_trigger';
import LoadingWrapper from 'components/widgets/loading/loading_wrapper';

export default class SettingPicture extends Component {
static defaultProps = {
imageContext: 'profile',
};
static propTypes = {
clientError: PropTypes.string,
serverError: PropTypes.string,
Expand All @@ -29,6 +32,7 @@ export default class SettingPicture extends Component {
title: PropTypes.string,
onFileChange: PropTypes.func,
updateSection: PropTypes.func,
imageContext: PropTypes.string,
maxFileSize: PropTypes.number,
helpText: PropTypes.object,
};
Expand Down
1 change: 1 addition & 0 deletions components/team_general_tab/team_general_tab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ export default class GeneralTab extends React.Component {
);
teamIconSection = (
<SettingPicture
imageContext='team'
title={Utils.localizeMessage('general_tab.teamIcon', 'Team Icon')}
src={Utils.imageURLForTeam(team)}
file={this.state.teamIconFile}
Expand Down