fix Feedback

src/server/models/user.js

@@ -524,7 +524,8 @@ module.exports = function(crowi) {
     const User = this;
     const conditions = {status: status};
 
-    return User.find(conditions).count();
+    // TODO count は非推奨。mongoose のバージョンアップ後に countDocuments に変更する。
+    return User.count(conditions);
   };
 
   userSchema.statics.isRegisterableUsername = async function(username) {

src/server/routes/login.js

@@ -190,9 +190,10 @@ module.exports = function(crowi, app) {
           if (err) {
             if (err.name === 'UserUpperLimitException') {
               req.flash('registerWarningMessage', 'Can not register more than the maximum number of users.');
-              return res.redirect('/register');
             }
-            req.flash('registerWarningMessage', 'Failed to register.');
+            else {
+              req.flash('registerWarningMessage', 'Failed to register.');
+            }
             return res.redirect('/register');
           }
           else {

src/server/views/admin/users.html

@@ -33,7 +33,7 @@
 
     <div class="col-md-9">
       <p>
-        <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm" {% if isUserCountExceedsUpperLimit === true %}disabled{% endif %}>
+        <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm" {% if isUserCountExceedsUpperLimit %}disabled{% endif %}>
           {{ t("user_management.invite_users") }}
         </button>
         <a class="btn btn-default btn-outline" href="/admin/users/external-accounts">