web: People: Added displayName and fixed getUserStatus

This commit is contained in:
Alexey Safronov 2019-07-23 16:13:47 +03:00
parent 1e28a0c013
commit 572ccfb893
2 changed files with 20 additions and 10 deletions

View File

@ -26,17 +26,25 @@ const getUserEmail = user => {
}; };
const getUserRole = user => { const getUserRole = user => {
if (user.isOwner) return "owner"; if (user.isOwner)
else if (user.isAdmin) return "admin"; return "owner";
else if (user.isVisitor) return "guest"; else if (user.isAdmin)
else return "user"; return "admin";
else if (user.isVisitor)
return "guest";
else
return "user";
}; };
const getUserStatus = user => { const getUserStatus = user => {
if (user.state === 1 && user.activationStatus === 1) return "normal"; if (user.status === 1 && user.activationStatus === 1)
else if (user.state === 1 && user.activationStatus === 2) return "pending"; return "normal";
else if (user.state === 2) return "disabled"; else if (user.status === 1 && user.activationStatus === 2)
else return "normal"; return "pending";
else if (user.status === 2)
return "disabled";
else
return "normal";
}; };
const getUserContextOptions = user => { const getUserContextOptions = user => {
@ -170,6 +178,7 @@ class SectionBodyContent extends React.Component {
> >
<UserContent <UserContent
userName={item.user.userName} userName={item.user.userName}
displayName={item.user.displayName}
department={item.department} department={item.department}
phone={item.phone} phone={item.phone}
email={item.email} email={item.email}

View File

@ -6,6 +6,7 @@ var config = require('../../../../../../package.json');
const UserContent = ({ const UserContent = ({
userName, userName,
displayName,
department, department,
phone, phone,
email, email,
@ -21,8 +22,8 @@ const UserContent = ({
status === "pending" ? { color: "#A3A9AE" } : { color: "#333333" } status === "pending" ? { color: "#A3A9AE" } : { color: "#333333" }
} }
type="action" type="action"
title={userName} title={displayName}
text={userName} text={displayName}
isBold={true} isBold={true}
fontSize={15} fontSize={15}
onClick={() => { onClick={() => {