optimize code

frontend/src/pages/sys-admin/logs-page/file-access-logs.js

@@ -205,7 +205,6 @@ class FileAccessLogs extends Component {
       perPage: parseInt(urlParams.get('per_page') || perPage),
       currentPage: parseInt(urlParams.get('page') || currentPage),
     }, () => {
-      // this.getAvailableUsers();
       this.getLogsByPage(this.state.currentPage);
     });
   }
@@ -246,18 +245,6 @@ class FileAccessLogs extends Component {
     navigate(url.toString());
   };
 
-  getAvailableUsers = () => {
-    systemAdminAPI.sysAdminListUsers().then((res) => {
-      this.setState({
-        availableUsers: res.data.data
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
   handleUserFilter = (user, shouldFetchData = true) => {
     const { selectedUsers } = this.state;
     let newSelectedUsers;
@@ -283,18 +270,6 @@ class FileAccessLogs extends Component {
     });
   };
 
-  getAvailableRepos = () => {
-    systemAdminAPI.sysAdminSearchRepos().then((res) => {
-      this.setState({
-        availableRepos: res.data.repos
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
   handleRepoFilter = (repo, shouldFetchData = true) => {
     const { selectedRepos } = this.state;
     let newSelectedRepos;

frontend/src/pages/sys-admin/logs-page/file-transfer-log.js

@@ -309,17 +309,6 @@ class FIleTransferLogs extends Component {
     });
   };
 
-  getAvailableRepos = () => {
-    systemAdminAPI.sysAdminListRepos().then((res) => {
-      this.setState({
-        availableRepos: res.data.repos
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
 
   handleRepoFilter = (repo, shouldFetchData = true) => {
     const { selectedRepos } = this.state;

frontend/src/pages/sys-admin/logs-page/file-update-logs.js

@@ -249,30 +249,6 @@ class FileUpdateLogs extends Component {
     });
   };
 
-  getAvailableUsers = () => {
-    systemAdminAPI.sysAdminListUsers().then((res) => {
-      this.setState({
-        availableUsers: res.data.data
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
-  getAvailableRepos = () => {
-    systemAdminAPI.sysAdminListRepos().then((res) => {
-      this.setState({
-        availableRepos: res.data.repos
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
   handleSelectorToggle = (selectorType) => {
     const { openSelector } = this.state;
     const wasOpen = openSelector === selectorType;

frontend/src/pages/sys-admin/logs-page/login-logs.js

@@ -157,23 +157,10 @@ class LoginLogs extends Component {
       perPage: parseInt(urlParams.get('per_page') || perPage),
       currentPage: parseInt(urlParams.get('page') || currentPage)
     }, () => {
-      // this.getAvailableUsers();
       this.getLogsByPage(this.state.currentPage);
     });
   }
 
-  getAvailableUsers = () => {
-    systemAdminAPI.sysAdminListUsers().then((res) => {
-      this.setState({
-        availableUsers: res.data.data
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
   getLogsByPage = (page) => {
     let { perPage, selectedUsers } = this.state;
     let emails = selectedUsers.map(user => user.email);

frontend/src/pages/sys-admin/logs-page/share-permission-logs.js

@@ -262,30 +262,6 @@ class SharePermissionLogs extends Component {
     });
   };
 
-  getAvailableUsers = () => {
-    systemAdminAPI.sysAdminListUsers().then((res) => {
-      this.setState({
-        availableUsers: res.data.data
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
-  getAvailableRepos = () => {
-    systemAdminAPI.sysAdminListRepos().then((res) => {
-      this.setState({
-        availableRepos: res.data.repos
-      });
-    }).catch((error) => {
-      this.setState({
-        errorMsg: Utils.getErrorMsg(error, true)
-      });
-    });
-  };
-
   handleSelectorToggle = (selectorType) => {
     const { openSelector } = this.state;
     const wasOpen = openSelector === selectorType;

seahub/api2/endpoints/admin/logs.py

@@ -6,7 +6,6 @@ from rest_framework.permissions import IsAdminUser
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework import status
-from django.db.models import Q
 from seaserv import ccnet_api, seafile_api
 
 from seahub.api2.authentication import TokenAuthentication
@@ -17,7 +16,7 @@ from seahub.api2.utils import api_error
 from seahub.base.templatetags.seahub_tags import email2nickname, \
         email2contact_email, translate_commit_desc
 from seahub.utils import get_log_events_by_type_users_repo, generate_file_audit_event_type, \
-    get_file_update_events, get_perm_audit_events, is_valid_email
+    is_valid_email
 from seahub.utils.timeutils import datetime_to_isoformat_timestr, utc_datetime_to_isoformat_timestr
 from seahub.utils.repo import is_valid_repo_id_format
 from seahub.base.models import RepoTransfer, GroupMemberAudit
@@ -132,8 +131,6 @@ class AdminLogsFileAccessLogs(APIView):
         limit = per_page + 1
 
         events = get_log_events_by_type_users_repo('file_audit', emails, repos, start, limit) or []
-        if events is None:
-            events = []
         if len(events) > per_page:
             events = events[:per_page]
             has_next_page = True
@@ -232,9 +229,7 @@ class AdminLogsFileUpdateLogs(APIView):
         start = per_page * (current_page - 1)
         limit = per_page
 
-        events = get_log_events_by_type_users_repo('file_update', emails, repos, start, limit)
+        events = get_log_events_by_type_users_repo('file_update', emails, repos, start, limit) or []
-        if events is None:
-            events = []
         has_next_page = True if len(events) == per_page else False
 
         # Use dict to reduce memcache fetch cost in large for-loop.
@@ -337,8 +332,6 @@ class AdminLogsSharePermissionLogs(APIView):
 
 
         events = get_log_events_by_type_users_repo('perm_audit', emails, repos, start, limit) or []
-        if events is None:
-            events = []
         has_next_page = True if len(events) == per_page else False
 
         # Use dict to reduce memcache fetch cost in large for-loop.

seahub/api2/endpoints/admin/users.py

@@ -578,6 +578,7 @@ class AdminUsers(APIView):
 
             info['quota_usage'] = user.quota_usage
             info['quota_total'] = seafile_api.get_user_quota(user.email)
+
             last_login_obj = UserLastLogin.objects.get_by_username(user.email)
             if last_login_obj:
                 info['last_login'] = datetime_to_isoformat_timestr(last_login_obj.last_login)