summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-03-16 18:28:45 +0100
committerMorris Jobke <hey@morrisjobke.de>2016-07-07 15:10:03 +0200
commitc809db86f5a3ea20875e9963d8fe074ae45b49e1 (patch)
tree33eed82535ae75d6c1429525cc6fc676a2ed4e30 /apps/files_sharing/js
parentab3c8d4de969dbb57db80bd16621dd34a859305f (diff)
downloadnextcloud-server-c809db86f5a3ea20875e9963d8fe074ae45b49e1.tar.gz
nextcloud-server-c809db86f5a3ea20875e9963d8fe074ae45b49e1.zip
Not set expiration date is represented as 0
Diffstat (limited to 'apps/files_sharing/js')
-rw-r--r--apps/files_sharing/js/sharedfilelist.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 7b490b3d557..3446cb37a87 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -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)