haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 02:10:24 +00:00
Code Issues Releases Wiki Activity

[share/upload links] show exact expiration time (#4570)

Browse Source
This commit is contained in:
llj
2020-05-25 17:29:16 +08:00
committed by GitHub
parent 41890ad69e
commit ea8e61d250
4 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/pages/share-admin/share-links.js
View File

@@ -156,20 +156,13 @@ class Item extends Component {
} }
renderExpiration = () => { renderExpiration = () => {
let item = this.props.item; const item = this.props.item;
if (!item.expire_date) { if (!item.expire_date) {
return ( return '--';
<Fragment>--</Fragment>
);
} }
let expire_date = moment(item.expire_date).format('YYYY-MM-DD'); const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
return ( const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
<Fragment> return (<span className={item.is_expired ? 'error' : ''} title={expire_time}>{expire_date}</span>);
{item.is_expired ?
<span className="error">{expire_date}</span> : expire_date
}
</Fragment>
);
} }
changePerm = (permission) => { changePerm = (permission) => {

19
frontend/src/pages/share-admin/upload-links.js
View File

@@ -105,20 +105,13 @@ class Item extends Component {
} }
renderExpiration = () => { renderExpiration = () => {
let item = this.props.item; const item = this.props.item;
if (!item.expire_date) { if (!item.expire_date) {
return ( return '--';
<Fragment>--</Fragment> }
); 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');
let expire_date = moment(item.expire_date).format('YYYY-MM-DD'); return (<span className={item.is_expired ? 'error' : ''} title={expire_time}>{expire_date}</span>);
return (
<Fragment>
{item.is_expired ?
<span className="error">{expire_date}</span> : expire_date
}
</Fragment>
);
} }
render() { render() {

17
frontend/src/pages/sys-admin/links/share-links.js
View File

@@ -126,20 +126,13 @@ class Item extends Component {
} }
renderExpiration = () => { renderExpiration = () => {
let item = this.props.item; const item = this.props.item;
if (!item.expire_date) { if (!item.expire_date) {
return ( return '--';
<Fragment>--</Fragment>
);
} }
let expire_date = moment(item.expire_date).format('YYYY-MM-DD'); const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
return ( const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
<Fragment> return (<span className={item.is_expired ? 'error' : ''} title={expire_time}>{expire_date}</span>);
{item.is_expired ?
<span className="error">{expire_date}</span> : expire_date
}
</Fragment>
);
} }
render() { render() {

15
frontend/src/pages/sys-admin/links/upload-links.js
View File

@@ -107,18 +107,11 @@ class Item extends Component {
renderExpiration = () => { renderExpiration = () => {
let item = this.props.item; let item = this.props.item;
if (!item.expire_date) { if (!item.expire_date) {
return ( return '--';
<Fragment>--</Fragment>
);
} }
let expire_date = moment(item.expire_date).format('YYYY-MM-DD'); const expire_date = moment(item.expire_date).format('YYYY-MM-DD');
return ( const expire_time = moment(item.expire_date).format('YYYY-MM-DD HH:mm:ss');
<Fragment> return (<span className={item.is_expired ? 'error' : ''} title={expire_time}>{expire_date}</span>);
{item.is_expired ?
<span className="error">{expire_date}</span> : expire_date
}
</Fragment>
);
} }
render() { render() {