diff options
| author | George Goldberg <george@gberg.me> | 2016-12-14 11:11:51 +0000 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-12-14 08:11:51 -0300 |
| commit | 8406e854aa912f3d7f9179b10356444f07e25223 (patch) | |
| tree | 353294a5ae87cf0c0cf3e675f32073fff1988d16 /webapp/components/user_profile.jsx | |
| parent | 973585450378a457a94824b7852c7ab7194e2b3e (diff) | |
| download | chat-8406e854aa912f3d7f9179b10356444f07e25223.tar.gz chat-8406e854aa912f3d7f9179b10356444f07e25223.tar.bz2 chat-8406e854aa912f3d7f9179b10356444f07e25223.zip | |
PLT-4332 Position field for Users (#4632)
* Add User.Position field to store & model.
* GOFMT
* Add Position to user settings.
* Unit tests.
* Add position to profile popup.
* i18n
* Fix log message for invalid position.
* Add Position field attribute to LDAP config.
* Add Position field attribute to SAML config.
* Reword empty position message.
* Change Position Max Length to 35.
* Better invalid position error message.
* Add new fields to config.json.
* Ensure position is never longer than max when displayed.
* Hard limit of 64 chars with soft limit still 35
* Put field with other attributes.
Diffstat (limited to 'webapp/components/user_profile.jsx')
| -rw-r--r-- | webapp/components/user_profile.jsx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx index 21dbf9699..9cf2464cd 100644 --- a/webapp/components/user_profile.jsx +++ b/webapp/components/user_profile.jsx @@ -182,6 +182,23 @@ export default class UserProfile extends React.Component { dataContent.push(webrtc); + const position = this.props.user.position.substring(0, Constants.MAX_POSITION_LENGTH); + if (position) { + dataContent.push( + <div + data-toggle='tooltip' + title={position} + key='user-popover-position' + > + <p + className='text-nowrap' + > + {position} + </p> + </div> + ); + } + if (global.window.mm_config.ShowEmailAddress === 'true' || UserStore.isSystemAdminForCurrentUser() || this.props.user === UserStore.getCurrentUser()) { dataContent.push( <div |