haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00
Code Issues Releases Wiki Activity

show "Expired" when file share expired

Browse Source
This commit is contained in:
lian
2015-08-18 15:18:02 +08:00
parent 0a4f191df3
commit fdafab3d5a
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/share/models.py
View File

@@ -145,6 +145,12 @@ class FileShare(models.Model):
def is_encrypted(self): def is_encrypted(self):
return True if self.password is not None else False return True if self.password is not None else False
def is_expired(self):
if self.expire_date is not None and timezone.now() > self.expire_date:
return True
else:
return False
class OrgFileShareManager(models.Manager): class OrgFileShareManager(models.Manager):
def set_org_file_share(self, org_id, file_share): def set_org_file_share(self, org_id, file_share):
"""Set a share link as org share link. """Set a share link as org share link.

1
seahub/share/views.py
View File

@@ -1413,6 +1413,7 @@ def ajax_get_download_link(request):
data = { data = {
'download_link': gen_shared_link(token, l[0].s_type), 'download_link': gen_shared_link(token, l[0].s_type),
'token': token, 'token': token,
'is_expired': l[0].is_expired(),
} }
else: else:
data = {} data = {}

14
static/scripts/app/views/share.js
View File

@@ -119,12 +119,22 @@ define([
downloadLinkPanelInit: function() { downloadLinkPanelInit: function() {
var _this = this; var _this = this;
var after_op_success = function(data) { var after_op_success = function(data) {
_this.$('.loading-tip').hide(); _this.$('.loading-tip').hide();
if (data['download_link']) { if (data['download_link']) {
if (data['is_expired']) {
_this.$('#send-download-link').addClass('hide');
_this.$('#download-link').html(data['download_link'] + ' ' + gettext('(Expired)'))
.addClass('error');
_this.$('#direct-dl-link').html(data['download_link']+'?raw=1' + ' ' + gettext('(Expired)'))
.addClass('error');
} else {
_this.$('#download-link').html(data['download_link']); // TODO:
_this.$('#direct-dl-link').html(data['download_link']+'?raw=1'); // TODO:
}
_this.download_link = data["download_link"]; // for 'link send' _this.download_link = data["download_link"]; // for 'link send'
_this.download_link_token = data["token"]; // for 'link delete' _this.download_link_token = data["token"]; // for 'link delete'
_this.$('#download-link').html(data['download_link']); // TODO:
_this.$('#direct-dl-link').html(data['download_link']+'?raw=1'); // TODO:
_this.$('#download-link-operations').removeClass('hide'); _this.$('#download-link-operations').removeClass('hide');
} else { } else {
_this.$('#generate-download-link-form').removeClass('hide'); _this.$('#generate-download-link-form').removeClass('hide');