diff --git a/frontend/src/pages/share-admin/share-links.js b/frontend/src/pages/share-admin/share-links.js
index f3177336e1..4e4c3c1db7 100644
--- a/frontend/src/pages/share-admin/share-links.js
+++ b/frontend/src/pages/share-admin/share-links.js
@@ -156,20 +156,13 @@ class Item extends Component {
}
renderExpiration = () => {
- let item = this.props.item;
+ const item = this.props.item;
if (!item.expire_date) {
- return (
- --
- );
+ return '--';
}
- let expire_date = moment(item.expire_date).format('YYYY-MM-DD');
- return (
-
- {item.is_expired ?
- {expire_date} : expire_date
- }
-
- );
+ const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
+ const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
+ return ({expire_date});
}
changePerm = (permission) => {
diff --git a/frontend/src/pages/share-admin/upload-links.js b/frontend/src/pages/share-admin/upload-links.js
index d1e0bb1cab..370d3cb0fc 100644
--- a/frontend/src/pages/share-admin/upload-links.js
+++ b/frontend/src/pages/share-admin/upload-links.js
@@ -105,20 +105,13 @@ class Item extends Component {
}
renderExpiration = () => {
- let item = this.props.item;
+ const item = this.props.item;
if (!item.expire_date) {
- return (
- --
- );
- }
- let expire_date = moment(item.expire_date).format('YYYY-MM-DD');
- return (
-
- {item.is_expired ?
- {expire_date} : expire_date
- }
-
- );
+ return '--';
+ }
+ const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
+ const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
+ return ({expire_date});
}
render() {
diff --git a/frontend/src/pages/sys-admin/links/share-links.js b/frontend/src/pages/sys-admin/links/share-links.js
index 1289c82598..f546b5d17e 100644
--- a/frontend/src/pages/sys-admin/links/share-links.js
+++ b/frontend/src/pages/sys-admin/links/share-links.js
@@ -126,20 +126,13 @@ class Item extends Component {
}
renderExpiration = () => {
- let item = this.props.item;
+ const item = this.props.item;
if (!item.expire_date) {
- return (
- --
- );
+ return '--';
}
- let expire_date = moment(item.expire_date).format('YYYY-MM-DD');
- return (
-
- {item.is_expired ?
- {expire_date} : expire_date
- }
-
- );
+ const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
+ const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
+ return ({expire_date});
}
render() {
diff --git a/frontend/src/pages/sys-admin/links/upload-links.js b/frontend/src/pages/sys-admin/links/upload-links.js
index 2c182182ea..ca7b601faf 100644
--- a/frontend/src/pages/sys-admin/links/upload-links.js
+++ b/frontend/src/pages/sys-admin/links/upload-links.js
@@ -107,18 +107,11 @@ class Item extends Component {
renderExpiration = () => {
let item = this.props.item;
if (!item.expire_date) {
- return (
- --
- );
+ return '--';
}
- let expire_date = moment(item.expire_date).format('YYYY-MM-DD');
- return (
-
- {item.is_expired ?
- {expire_date} : expire_date
- }
-
- );
+ const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
+ const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
+ return ({expire_date});
}
render() {