Skip to content

Add expiration date row #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MorrisJobke wants to merge 5 commits into from
Closed

Add expiration date row #307

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cc8fec
Add expiration date to share by link view
MorrisJobke Sep 30, 2015
d2223ac
add "Never" if expiration date is not set
MorrisJobke Oct 2, 2015
9ae492e
Not set expiration date is represented as 0
MorrisJobke Mar 16, 2016
65b53e4
Update header during update callback
MorrisJobke Apr 1, 2016
5f04885
add unit tests
MorrisJobke Jul 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Not set expiration date is represented as 0
  • Loading branch information
@MorrisJobke
MorrisJobke committed Jul 4, 2016
commit 9ae492e25cbcdefcbb2fa0109acaaf1f940637d9
5 changes: 4 additions & 1 deletion apps/files_sharing/js/sharedfilelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@

// add row with expiration date for link only shares - influenced by _createRow of filelist
if (this._linksOnly) {
var expirationTimestamp = moment(fileData.shares[0].expiration).valueOf();
var expirationTimestamp = 0;
if(fileData.shares[0].expiration !== null) {
expirationTimestamp = moment(fileData.shares[0].expiration).valueOf();
}
$tr.attr('data-expiration', expirationTimestamp);

// date column (1000 milliseconds to seconds, 60 seconds, 60 minutes, 24 hours)
Expand Down