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

Show file tree
Hide file tree
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
Next Next commit
Add expiration date to share by link view
  • Loading branch information
@MorrisJobke
MorrisJobke committed Jul 4, 2016
commit 7cc8fec32702dc6d4c07d6dbbf0f0aa19f6e3402
38 changes: 38 additions & 0 deletions apps/files_sharing/js/sharedfilelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,38 @@
var permission = parseInt($tr.attr('data-permissions')) | OC.PERMISSION_DELETE;
$tr.attr('data-permissions', permission);
}

// 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();
$tr.attr('data-expiration', expirationTimestamp);

// date column (1000 milliseconds to seconds, 60 seconds, 60 minutes, 24 hours)
// 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') {
modifiedColor = 160;
}

if (expirationTimestamp > 0) {
formatted = OC.Util.formatDate(expirationTimestamp);
text = OC.Util.relativeModifiedDate(expirationTimestamp);
} else {
formatted = t('files_sharing', 'No expiration date set');
text = '';
}
td = $('<td></td>').attr({"class": "date"});
td.append($('<span></span>').attr({
"class": "modified",
"title": formatted,
"style": 'color:rgb(' + modifiedColor + ',' + modifiedColor + ',' + modifiedColor + ')'
}).text(text)
.tooltip({placement: 'top'})
);

$tr.append(td);
}
return $tr;
},

Expand Down Expand Up @@ -172,6 +204,11 @@

if (shares[0].ocs && shares[0].ocs.data) {
files = files.concat(this._makeFilesFromShares(shares[0].ocs.data));

// hide expiration date header for non link only shares
if (!this._linksOnly) {
this.$el.find('th.column-expiration').addClass('hidden');
}
}

if (remoteShares && remoteShares[0].ocs && remoteShares[0].ocs.data) {
Expand Down Expand Up @@ -249,6 +286,7 @@
type: share.share_type,
target: share.share_with,
stime: share.stime * 1000,
expiration: share.expiration,
};
if (self._sharedWithUser) {
file.shareOwner = share.displayname_owner;
Expand Down
3 changes: 3 additions & 0 deletions apps/files_sharing/templates/list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
</th>
<th class="hidden column-expiration">
<a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a>
</th>
</tr>
</thead>
<tbody id="fileList">
Expand Down