change User.isUserCountExceedsUpperLimit

src/server/models/user.js

@@ -505,17 +505,17 @@ module.exports = function(crowi) {
     });
   };
 
-  userSchema.statics.isUserUpperLimitError = async function() {
-    let isUserUpperLimitError = false;
+  userSchema.statics.isUserCountExceedsUpperLimit = async function() {
+    let isUserCountExceedsUpperLimit = false;
     const User = this;
     const Config = crowi.model('Config');
     const userUpperLimit = Config.userUpperLimit(crowi);
     const activeUsers = await User.findAllUsers({status: User.STATUS_ACTIVE});
     if (userUpperLimit !== 0 && userUpperLimit <= activeUsers.length) {
-      isUserUpperLimitError = true;
+      isUserCountExceedsUpperLimit = true;
     }
 
-    return isUserUpperLimitError;
+    return isUserCountExceedsUpperLimit;
   };
 
   userSchema.statics.isRegisterableUsername = async function(username) {
@@ -719,8 +719,8 @@ module.exports = function(crowi) {
       , newUser = new User();
 
     // check user upper limit
-    const isUserUpperLimitError = await User.isUserUpperLimitError();
-    if (isUserUpperLimitError) {
+    const isUserCountExceedsUpperLimit = await User.isUserCountExceedsUpperLimit();
+    if (isUserCountExceedsUpperLimit) {
       const err = new UserUpperLimitException();
       return callback(err);
     }

src/server/routes/admin.js

@@ -473,7 +473,7 @@ module.exports = function(crowi, app) {
     const activeUsers = findAllUsers.length;
     const Config = crowi.model('Config');
     const userUpperLimit = Config.userUpperLimit(crowi);
-    const isUserUpperLimitError = await User.isUserUpperLimitError();
+    const isUserCountExceedsUpperLimit = await User.isUserCountExceedsUpperLimit();
 
     var page = parseInt(req.query.page) || 1;
 
@@ -485,7 +485,7 @@ module.exports = function(crowi, app) {
         pager: pager,
         activeUsers: activeUsers,
         userUpperLimit: userUpperLimit,
-        isUserUpperLimitError: isUserUpperLimitError
+        isUserCountExceedsUpperLimit: isUserCountExceedsUpperLimit
       });
     });
   };

src/server/routes/login.js

@@ -345,8 +345,8 @@ module.exports = function(crowi, app) {
       var password = invitedForm.password;
 
       // check user upper limit
-      const isUserUpperLimitError = await User.isUserUpperLimitError();
-      if (isUserUpperLimitError) {
+      const isUserCountExceedsUpperLimit = await User.isUserCountExceedsUpperLimit();
+      if (isUserCountExceedsUpperLimit) {
         req.flash('warningMessage', 'ユーザーが上限に達したためアクティベートできません。');
         return res.redirect('/invited');
       }

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 isUserUpperLimitError === true %}disabled{% endif %}>
+        <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm" {% if isUserCountExceedsUpperLimit === true %}disabled{% endif %}>
           {{ t("user_management.invite_users") }}
         </button>
         <a class="btn btn-default btn-outline" href="/admin/users/external-accounts">
@@ -56,7 +56,7 @@
         <input type="hidden" name="_csrf" value="{{ csrf() }}">
       </form>
 
-      {% if isUserUpperLimitError === true %}
+      {% if isUserCountExceedsUpperLimit === true %}
       <label>{{ t('user_management.cannot_invite_maximum_users') }}</label>
       {% endif %}
       {% if userUpperLimit !== 0 %}