From 6f1a8cd3502ffb9f585d4be969ab30c1df848b20 Mon Sep 17 00:00:00 2001 From: llj Date: Tue, 28 Apr 2020 18:21:00 +0800 Subject: [PATCH] [system admin] orgs, inst: use '24 hour time' for pages (#4550) --- frontend/src/pages/sys-admin/institutions/institution-admins.js | 2 +- frontend/src/pages/sys-admin/institutions/institution-users.js | 2 +- frontend/src/pages/sys-admin/orgs/org-groups.js | 2 +- frontend/src/pages/sys-admin/orgs/org-users.js | 2 +- frontend/src/pages/sys-admin/orgs/orgs-content.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/pages/sys-admin/institutions/institution-admins.js b/frontend/src/pages/sys-admin/institutions/institution-admins.js index be84b5b96b..13d552ff9b 100644 --- a/frontend/src/pages/sys-admin/institutions/institution-admins.js +++ b/frontend/src/pages/sys-admin/institutions/institution-admins.js @@ -158,7 +158,7 @@ class Item extends Component { {`${Utils.bytesToSize(item.quota_usage)} / ${item.quota_total > 0 ? Utils.bytesToSize(item.quota_total) : '--'}`} - {moment(item.create_time).format('YYYY-MM-DD hh:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} + {moment(item.create_time).format('YYYY-MM-DD HH:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} {isOpIconShown && diff --git a/frontend/src/pages/sys-admin/institutions/institution-users.js b/frontend/src/pages/sys-admin/institutions/institution-users.js index e1dc590fad..b8d4acb123 100644 --- a/frontend/src/pages/sys-admin/institutions/institution-users.js +++ b/frontend/src/pages/sys-admin/institutions/institution-users.js @@ -193,7 +193,7 @@ class Item extends Component { {`${Utils.bytesToSize(item.quota_usage)} / ${item.quota_total > 0 ? Utils.bytesToSize(item.quota_total) : '--'}`} - {moment(item.create_time).format('YYYY-MM-DD hh:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} + {moment(item.create_time).format('YYYY-MM-DD HH:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} {isOpIconShown && diff --git a/frontend/src/pages/sys-admin/orgs/org-groups.js b/frontend/src/pages/sys-admin/orgs/org-groups.js index 6a71d2aadd..2128f3db60 100644 --- a/frontend/src/pages/sys-admin/orgs/org-groups.js +++ b/frontend/src/pages/sys-admin/orgs/org-groups.js @@ -103,7 +103,7 @@ class Item extends Component { {item.group_name} - {moment(item.created_at).format('YYYY-MM-DD hh:mm:ss')} + {moment(item.created_at).format('YYYY-MM-DD HH:mm:ss')} diff --git a/frontend/src/pages/sys-admin/orgs/org-users.js b/frontend/src/pages/sys-admin/orgs/org-users.js index fd5f9aacc8..4ddc79035f 100644 --- a/frontend/src/pages/sys-admin/orgs/org-users.js +++ b/frontend/src/pages/sys-admin/orgs/org-users.js @@ -197,7 +197,7 @@ class Item extends Component { {`${Utils.bytesToSize(item.quota_usage)} / ${item.quota_total > 0 ? Utils.bytesToSize(item.quota_total) : '--'}`} - {moment(item.ctime).format('YYYY-MM-DD hh:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} + {moment(item.ctime).format('YYYY-MM-DD HH:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'} {(isOpIconShown && item.email != username) && diff --git a/frontend/src/pages/sys-admin/orgs/orgs-content.js b/frontend/src/pages/sys-admin/orgs/orgs-content.js index 02b582cc61..44ff41ff1c 100644 --- a/frontend/src/pages/sys-admin/orgs/orgs-content.js +++ b/frontend/src/pages/sys-admin/orgs/orgs-content.js @@ -154,7 +154,7 @@ class Item extends Component { /> {`${Utils.bytesToSize(item.quota_usage)} / ${item.quota > 0 ? Utils.bytesToSize(item.quota) : '--'}`} - {moment(item.ctime).format('YYYY-MM-DD hh:mm:ss')} + {moment(item.ctime).format('YYYY-MM-DD HH:mm:ss')}