IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: People: Added displayName and fixed getUserStatus

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
View File

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

5
products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
View File

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