From c8b51b7bfcf4f7df78512d96feaa51a1ab2a5543 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Fri, 24 Aug 2018 17:54:42 +0800
Subject: [PATCH] update logic of show folder share icon

if current user has 'is_admin' library permssion, show folder share icon
---
 seahub/templates/js/templates.html      | 8 ++++----
 static/scripts/app/views/dir.js         | 1 +
 static/scripts/app/views/dirent-grid.js | 1 +
 static/scripts/app/views/dirent.js      | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 892c33c8e4..c3d1e2791d 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -485,7 +485,7 @@
     </div>
     <% } %>
 
-    <% if (!encrypted && (app.pageOptions.can_generate_share_link || app.pageOptions.can_generate_upload_link || is_repo_owner)) { %>
+    <% if (!encrypted && (app.pageOptions.can_generate_share_link || app.pageOptions.can_generate_upload_link || is_repo_owner || is_admin)) { %>
     <button class="btn-white hidden-sm-down" id="share-cur-dir">{% trans "Share" %}</button>
     <span class="sf2-icon-share hidden-md-up mobile-icon" id="share-cur-dir" aria-label="{% trans "Share" %}"></span>
     <% } %>
@@ -582,7 +582,7 @@
 
                 <a class="op-icon download sf2-icon-download sf2-x vh download-dir" href="#" title="{% trans "Download" %}" aria-label="{% trans "Download" %}"></a>
 
-                <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner)) { %>
+                <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner || is_admin)) { %>
                     <a href="#" class="op-icon share sf2-icon-share sf2-x vh" title="{% trans "Share" %}" aria-label="{% trans "Share" %}"></a>
                 <% } %>
                 <% if (dirent.perm == 'rw') { %>
@@ -658,7 +658,7 @@
                 <div class="hide sf-dropdown-menu">
                     <ul>
                         <li><a class="op download download-dir" href="#">{% trans "Download" %}</a></li>
-                        <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner)) { %>
+                        <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner || is_admin)) { %>
                         <li><a href="#" class="op share">{% trans "Share" %}</a></li>
                         <% } %>
                         <% if (dirent.perm == 'rw') { %>
@@ -1016,7 +1016,7 @@
         <ul>
             <li><a class="op download-dir" href="#">{% trans "Download" %}</a></li>
 
-            <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner)) { %>
+            <% if (!repo_encrypted && (can_generate_share_link || can_generate_upload_link || is_repo_owner || is_admin)) { %>
             <li><a class="op share" href="#">{% trans "Share" %}</a></li>
             <% } %>
 
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index fa0b5eb51b..5050f37943 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -558,6 +558,7 @@ define([
                     path: dir.path,
                     repo_id: dir.repo_id,
                     is_repo_owner: dir.is_repo_owner,
+                    is_admin: dir.is_admin,
                     site_root: app.pageOptions.site_root
                 };
 
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 5df8ebf367..a80808aad0 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -120,6 +120,7 @@ define([
                 category: dir.category,
                 repo_id: dir.repo_id,
                 is_repo_owner: dir.is_repo_owner,
+                is_admin: dir.is_admin,
                 can_set_folder_perm: can_set_folder_perm,
                 can_generate_share_link: app.pageOptions.can_generate_share_link,
                 can_generate_upload_link: app.pageOptions.can_generate_upload_link,
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 4d5af2e0c2..8293e02dbc 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -66,6 +66,7 @@ define([
                 category: dir.category,
                 repo_id: dir.repo_id,
                 is_repo_owner: dir.is_repo_owner,
+                is_admin: dir.is_admin,
                 repo_encrypted: dir.encrypted,
 
                 can_set_folder_perm: can_set_folder_perm,