From 37ed51bd4a7038df5ebeeb44af8af8132c9fed03 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Tue, 27 Nov 2018 17:24:02 +0800
Subject: [PATCH] show expire date info when render share link

---
 seahub/templates/js/templates.html |  2 ++
 static/scripts/app/views/share.js  | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index a293d10ab8..1c9aa9c29c 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -1257,6 +1257,7 @@
                 <div id="download-link-operations" class="hide">
                     <dl>
                         <dt>{% trans "Link: " %}</dt>
+                        <dt class="share-link-expire-date-info hide"></dt>
                         <dd id="download-link">
                             <span class="link-placeholder"></span>
                             <input type="text" readonly="readonly" value="" class="shared-link hide" />
@@ -1264,6 +1265,7 @@
                         </dd>
                         <% if (!is_dir) { %>
                         <dt>{% trans "Direct Download Link: " %}</dt>
+                        <dt class="share-link-expire-date-info hide"></dt>
                         <dd id="direct-dl-link">
                             <span class="link-placeholder"></span>
                             <input type="text" readonly="readonly" value="" class="shared-link hide" />
diff --git a/static/scripts/app/views/share.js b/static/scripts/app/views/share.js
index 9c5631b8a2..95fddb72e6 100644
--- a/static/scripts/app/views/share.js
+++ b/static/scripts/app/views/share.js
@@ -4,8 +4,9 @@ define([
     'underscore',
     'backbone',
     'common',
+    'moment',
     'app/views/folder-share-item'
-], function($, jQueryUI, _, Backbone, Common, FolderShareItemView) {
+], function($, jQueryUI, _, Backbone, Common, Moment, FolderShareItemView) {
     'use strict';
 
     var SharePopupView = Backbone.View.extend({
@@ -187,6 +188,11 @@ define([
                 this.$('#download-link-operations .shared-link-copy-icon').addClass('hide');
                 this.$('#download-link, #direct-dl-link').append(' <span class="error">(' + gettext('Expired') + ')</span>');
             } else {
+                if (link_data.expire_date) {
+                    var expire_date = Moment(link_data.expire_date).format('YYYY-MM-DD');
+                    var info = gettext("This share link will be expired at %s").replace('%s', expire_date);
+                    this.$('.share-link-expire-date-info').html(info).removeClass('hide');
+                }
                 this.$('#send-download-link').removeClass('hide');
                 this.$('#download-link-operations .shared-link-copy-icon').removeClass('hide');
                 this.$('#download-link .error, #direct-dl-link .error').remove('');
@@ -477,7 +483,7 @@ define([
                 window.getSelection().removeAllRanges();
                 var range = document.createRange();
                 range.selectNode(targetDom[0]);
-                window.getSelection().addRange(range); 
+                window.getSelection().addRange(range);
             } else {
                 targetDom.select();
             }
@@ -585,6 +591,7 @@ define([
                 },
                 complete: function() {
                     _this.deleteDownloadLinkCancel();
+                    _this.$('.share-link-expire-date-info').html('').addClass('hide')
                 }
             });
         },