Просмотр исходного кода

Change some word from debug errors

ryuichi-e 6 лет назад
Родитель
Сommit
23ccd6718c
2 измененных файлов с 5 добавлено и 4 удалено
  1. 2 2
      src/client/js/services/AdminUsersContainer.js
  2. 3 2
      src/server/routes/apiv3/users.js

+ 2 - 2
src/client/js/services/AdminUsersContainer.js

@@ -1,6 +1,5 @@
 import { Container } from 'unstated';
 import loggerFactory from '@alias/logger';
-import { toastError } from '../util/apiNotification';
 
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:services:AdminUserGroupDetailContainer');
@@ -77,13 +76,14 @@ export default class AdminUsersContainer extends Container {
     const { selectedStatusList } = this.state;
     selectedStatusList.add(statusType);
     this.setState({ selectedStatusList });
-    this.retrieveUsersByPagingNum();
+    this.retrieveUsersByPagingNum(1);
   }
 
   deleteStatusFromList(statusType) {
     const { selectedStatusList } = this.state;
     selectedStatusList.delete(statusType);
     this.setState({ selectedStatusList });
+    this.retrieveUsersByPagingNum(1);
   }
 
   handleChangeSearchText(searchText) {

+ 3 - 2
src/server/routes/apiv3/users.js

@@ -107,7 +107,8 @@ module.exports = (crowi) => {
     const page = parseInt(req.query.page) || 1;
     // status
     const { selectedStatusList } = req.query;
-    const statusNoList = selectedStatusList.map(element => statusNo[element]);
+    const statusNoList = (selectedStatusList.includes('All')) ? [1, 2, 3, 5] : selectedStatusList.map(element => statusNo[element]);
+
     // Search from input
     const searchText = req.query.searchText || '';
     const searchWord = new RegExp(`${searchText}`);
@@ -126,7 +127,7 @@ module.exports = (crowi) => {
       const paginateResult = await User.paginate(
         {
           $and: [
-            { status: { $in: statusNoList } },
+            { status: { $in:  statusNoList } },
             { $or: [orOutput] },
           ],
         },