yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 19:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply gustav feedback

Browse Source
This commit is contained in:
Fernando Chavez 2023-09-01 15:43:46 +02:00
parent 9e32479c1c
commit 253b39b3c9
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js
View File

@ -56,9 +56,9 @@ const Body = () => {
const currentTime = useRef(Date.now());
const getFieldInfo = (atField, byField) => {
const user = initialData[byField] ?? {};
const displayName = user ? getDisplayName(user, formatMessage) : '-';
const displayName = initialData[byField]
? getDisplayName(initialData[byField], formatMessage)
: '-';
const timestamp = initialData[atField] ? new Date(initialData[atField]).getTime() : Date.now();
const elapsed = timestamp - currentTime.current;
const { unit, value } = getUnits(-elapsed);

15
packages/core/admin/admin/src/content-manager/pages/ListView/index.js
View File

@ -797,19 +797,8 @@ function ListView({
if (['createdBy', 'updatedBy'].includes(name.split('.')[0])) {
// Display the users full name
return (
<Td key={key}>
<Typography textColor="neutral800">
{rowData[name.split('.')[0]]
? getDisplayName(rowData[name.split('.')[0]], formatMessage)
: '-'}
</Typography>
</Td>
);
}
if (['createdBy', 'updatedBy'].includes(name.split('.')[0])) {
// Display the users full name
// Some entries doesn't have a user assigned as creator/updater (ex: entries created through content API)
// In this case, we display a dash
return (
<Td key={key}>
<Typography textColor="neutral800">