From 97b0e98c7de4b783b63b83d17e0838bf952d9064 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 10 May 2018 12:13:47 +0800
Subject: [PATCH] [address book] modified group quota shown and etc.

---
 seahub/templates/js/sysadmin-templates.html           |  6 +++---
 .../sysadmin-app/views/address-book-group-item.js     | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index 3b52164fcd..6ac46b5671 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -694,7 +694,7 @@
 <script type="text/template" id="group-item-tmpl">
     <td><a href="{{ SITE_ROOT }}sysadmin/#groups/<%= id %>/libs/"><%- name %></a></td>
     <td>
-        <% if (owner && owner.indexOf('system admin') == -1) { %>
+        <% if (owner != 'system admin') { %>
         <a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(owner)); %>/"><%- owner %></a>
         <% } else { %>
         --
@@ -702,7 +702,7 @@
     </td>
     <td><time title="<%= time %>"><%= time_from_now %></time></td>
     <td>
-        <% if (owner && owner.indexOf('system admin') == -1) { %>
+        <% if (owner != 'system admin') { %>
         <a href="#" class="sf2-icon-delete sf2-x group-delete-btn op-icon vh" title="{% trans "Delete" %}" aria-label="{% trans "Delete" %}"></a>
         <a href="#" class="sf2-icon-move sf2-x group-transfer-btn op-icon vh" title="{% trans "Transfer" %}" aria-label="{% trans "Transfer" %}"></a>
         <% } %>
@@ -1155,7 +1155,7 @@
     <td><a href="{{ SITE_ROOT }}sysadmin/#address-book/groups/<%= id %>/"><%- name %></a></td>
     <td><time title="<%= time %>"><%= time_from_now %></time></td>
     <td>
-        <span><%= quota_shown %></span>
+        <span <% if (quota_error) { %>class="error"<% } %>><%= quota_shown %></span>
         <span title="{% trans "Edit Quota" %}" class="quota-edit-icon sf2-icon-edit op-icon vh"></span>
     </td>
     <td>
diff --git a/static/scripts/sysadmin-app/views/address-book-group-item.js b/static/scripts/sysadmin-app/views/address-book-group-item.js
index 68eae8e8a8..d9f684df3d 100644
--- a/static/scripts/sysadmin-app/views/address-book-group-item.js
+++ b/static/scripts/sysadmin-app/views/address-book-group-item.js
@@ -118,15 +118,22 @@ define([
             data['time'] = created_at.format('LLLL');
             data['time_from_now'] = Common.getRelativeTimeStr(created_at);
 
+            data['quota_error'] = false;
             switch(data['quota']) {
                 case -2: // no limit
                     data['quota_shown'] = '--';
                     break;
                 case -1: // not set or error
-                    data['quota_shown'] = 0;
+                    data['quota_shown'] = gettext("Error");
+                    data['quota_error'] = true;
                     break;
                 default:
-                    data['quota_shown'] = Common.quotaSizeFormat(data['quota']);
+                    if (data['quota'] > 0) {
+                        data['quota_shown'] = Common.quotaSizeFormat(data['quota']);
+                    } else {
+                        data['quota_shown'] = gettext("Error");
+                        data['quota_error'] = true;
+                    }
             }
 
             this.$el.html(this.template(data));