PLT-1831 Add statuses to centre channel profile pictures (#3826)
* Created profile picture componenet and added statuses to pictures in center channel * PLT-3899 - Updating UI for status indicators (#3823) * PLT-3899 - Updating UI for status indicators * Updating position of timestamps for compact layout
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
8c2ea22892
Коммит
dad764088e
@@ -1,11 +1,15 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
import ProfilePicture from 'components/profile_picture.jsx';
|
||||
|
||||
import UserStore from 'stores/user_store.jsx';
|
||||
import Constants from 'utils/constants.jsx';
|
||||
import PreferenceStore from 'stores/preference_store.jsx';
|
||||
|
||||
import Constants from 'utils/constants.jsx';
|
||||
import * as Utils from 'utils/utils.jsx';
|
||||
import Client from 'client/web_client.jsx';
|
||||
|
||||
import React from 'react';
|
||||
|
||||
export default function UserListRow({user, teamMember, actions, actionProps}) {
|
||||
@@ -32,23 +36,24 @@ export default function UserListRow({user, teamMember, actions, actionProps}) {
|
||||
});
|
||||
}
|
||||
|
||||
if (!user.status) {
|
||||
var status = UserStore.getStatus(user.id);
|
||||
user.status = status ? 'status-' + status : '';
|
||||
let status;
|
||||
if (user.status) {
|
||||
status = user.status;
|
||||
} else {
|
||||
status = UserStore.getStatus(user.id);
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
key={user.id}
|
||||
className='more-modal__row'
|
||||
>
|
||||
<span className={`more-modal__image-wrapper ${user.status}`}>
|
||||
<img
|
||||
className='more-modal__image'
|
||||
width='38'
|
||||
height='38'
|
||||
src={`${Client.getUsersRoute()}/${user.id}/image?time=${user.update_at}`}
|
||||
/>
|
||||
</span>
|
||||
<ProfilePicture
|
||||
src={`${Client.getUsersRoute()}/${user.id}/image?time=${user.update_at}`}
|
||||
status={status}
|
||||
width='32'
|
||||
height='32'
|
||||
/>
|
||||
<div
|
||||
className='more-modal__details'
|
||||
>
|
||||
|
||||
Ссылка в новой задаче
Block a user