Shun Miyazawa 3 лет назад
Родитель
Сommit
e0a2508733
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      packages/app/src/server/models/user.js
  2. 2 2
      packages/app/src/server/routes/apiv3/users.js

+ 1 - 1
packages/app/src/server/models/user.js

@@ -715,7 +715,7 @@ module.exports = function(crowi) {
     return users;
     return users;
   };
   };
 
 
-  userSchema.statics.findUserByUsernameRegex = async function(username, status, option) {
+  userSchema.statics.findUserByUsernameRegexWithTotalCount = async function(username, status, option) {
     const opt = option || {};
     const opt = option || {};
     const sortOpt = opt.sortOpt || { username: 1 };
     const sortOpt = opt.sortOpt || { username: 1 };
     const offset = opt.offset || 0;
     const offset = opt.offset || 0;

+ 2 - 2
packages/app/src/server/routes/apiv3/users.js

@@ -943,14 +943,14 @@ module.exports = (crowi) => {
       const data = {};
       const data = {};
 
 
       if (options.isIncludeActiveUser == null || options.isIncludeActiveUser) {
       if (options.isIncludeActiveUser == null || options.isIncludeActiveUser) {
-        const activeUserData = await User.findUserByUsernameRegex(q, [User.STATUS_ACTIVE], { offset, limit });
+        const activeUserData = await User.findUserByUsernameRegexWithTotalCount(q, [User.STATUS_ACTIVE], { offset, limit });
         const activeUsernames = activeUserData.users.map(user => user.username);
         const activeUsernames = activeUserData.users.map(user => user.username);
         Object.assign(data, { activeUser: { usernames: activeUsernames, totalCount: activeUserData.totalCount } });
         Object.assign(data, { activeUser: { usernames: activeUsernames, totalCount: activeUserData.totalCount } });
       }
       }
 
 
       if (options.isIncludeInactiveUser) {
       if (options.isIncludeInactiveUser) {
         const inactiveUserStates = [User.STATUS_REGISTERED, User.STATUS_SUSPENDED, User.STATUS_DELETED, User.STATUS_INVITED];
         const inactiveUserStates = [User.STATUS_REGISTERED, User.STATUS_SUSPENDED, User.STATUS_DELETED, User.STATUS_INVITED];
-        const inactiveUserData = await User.findUserByUsernameRegex(q, inactiveUserStates, { offset, limit });
+        const inactiveUserData = await User.findUserByUsernameRegexWithTotalCount(q, inactiveUserStates, { offset, limit });
         const inactiveUsernames = inactiveUserData.users.map(user => user.username);
         const inactiveUsernames = inactiveUserData.users.map(user => user.username);
         Object.assign(data, { inactiveUser: { usernames: inactiveUsernames, totalCount: inactiveUserData.totalCount } });
         Object.assign(data, { inactiveUser: { usernames: inactiveUsernames, totalCount: inactiveUserData.totalCount } });
       }
       }