summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-10-02 08:45:07 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-07-07 15:10:03 +0200
commitab3c8d4de969dbb57db80bd16621dd34a859305f (patch)
treea1d3278fdb04dc99853f5acad24f76a341d04a0f /apps/files_sharing
parentb5dea82e45ec6e7eea293605ddd4eac06a8d9dd0 (diff)
downloadnextcloud-server-ab3c8d4de969dbb57db80bd16621dd34a859305f.tar.gz
nextcloud-server-ab3c8d4de969dbb57db80bd16621dd34a859305f.zip
add "Never" if expiration date is not set
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/js/sharedfilelist.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 10ea3e33efd..7b490b3d557 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -89,7 +89,7 @@
// difference in days multiplied by 5 - brightest shade for expiry dates in more than 32 days (160/5)
var modifiedColor = Math.round((expirationTimestamp - (new Date()).getTime()) / 1000 / 60 / 60 / 24 * 5);
// ensure that the brightest color is still readable
- if (modifiedColor >= '160') {
+ if (modifiedColor >= 160) {
modifiedColor = 160;
}
@@ -98,7 +98,8 @@
text = OC.Util.relativeModifiedDate(expirationTimestamp);
} else {
formatted = t('files_sharing', 'No expiration date set');
- text = '';
+ text = t('files_sharing', 'Never');
+ modifiedColor = 160;
}
td = $('<td></td>').attr({"class": "date"});
td.append($('<span></span>').attr({