From 488c8802a374a1b5ce6bb1708a15eb2c95dd5146 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Fri, 13 Apr 2018 13:27:05 +0800
Subject: [PATCH] update multi storages backend

1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
---
 seahub/templates/js/templates.html          | 6 ++++--
 seahub/utils/repo.py                        | 2 +-
 static/scripts/app/views/add-group-repo.js  | 1 -
 static/scripts/app/views/create-pub-repo.js | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index bea5a0ea53..9c0171c850 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -13,6 +13,7 @@
         </select>
         <br/>
         <% } %>
+        <% if (!$.isEmptyObject(app.pageOptions.storages)) { %>
         <% if (app.pageOptions.storages.length > 1) { %>
         <label for="storage">{% trans "Storage backend"%}</label><br/>
         <select name="storage" id="storage" class="select">
@@ -27,6 +28,7 @@
         </select>
         <br/>
         <% } %>
+        <% } %>
         <% if (showSharePerm) { %>
         <label for="share-permission">{% trans "Share Permission" %}</label><br />
         <select id="share-permission" name="permission" class="select">
@@ -1613,8 +1615,8 @@
         <th width="14%"><span class="sr-only">{% trans "Actions" %}</span></th>
     <% if (app.pageOptions.storages.length > 0) { %>
         <th width="10%">{% trans "Size" %}</th>
-        <th width="20%">{% trans "Storage backend" %}</th>
-        <th width="10%"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-up"></span></a></th>
+        <th width="15%">{% trans "Storage backend" %}</th>
+        <th width="15%"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-up"></span></a></th>
         <% } else { %>
         <th width="20%">{% trans "Size" %}</th>
         <th width="20%"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-up"></span></a></th>
diff --git a/seahub/utils/repo.py b/seahub/utils/repo.py
index fa5dd22efd..b977f5da1b 100644
--- a/seahub/utils/repo.py
+++ b/seahub/utils/repo.py
@@ -99,7 +99,7 @@ def get_library_storages(request):
     elif STORAGE_CLASS_MAPPING_POLICY == 'ROLE_BASED':
         user_role_storage_ids = request.user.permissions.storage_ids()
         if not user_role_storage_ids:
-            return all_storages
+            return []
 
         user_role_storages = []
         for user_role_storage_id in user_role_storage_ids:
diff --git a/static/scripts/app/views/add-group-repo.js b/static/scripts/app/views/add-group-repo.js
index 095e740dbb..5f568aaeb5 100644
--- a/static/scripts/app/views/add-group-repo.js
+++ b/static/scripts/app/views/add-group-repo.js
@@ -13,7 +13,6 @@ define([
             return {
                 showSharePerm: true,
                 enable_encrypted_library: app.pageOptions.enable_encrypted_library,
-                storages: app.pageOptions.storages,
                 library_templates: app.pageOptions.library_templates
             };
         },
diff --git a/static/scripts/app/views/create-pub-repo.js b/static/scripts/app/views/create-pub-repo.js
index 56f65c6cad..a9e87c5ced 100644
--- a/static/scripts/app/views/create-pub-repo.js
+++ b/static/scripts/app/views/create-pub-repo.js
@@ -13,7 +13,6 @@ define([
             return {
                 showSharePerm: true,
                 enable_encrypted_library: app.pageOptions.enable_encrypted_library,
-                storages: app.pageOptions.storages,
                 library_templates: app.pageOptions.library_templates
             };
         },