From 2c86c62d7f2c9bbe8f031732b060c3647cdeaf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 5 Apr 2022 07:06:18 +0200 Subject: [PATCH] meta infinite members fix --- resources/js/helpers/ValidatorHelpers.js | 5 +++++ src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/resources/js/helpers/ValidatorHelpers.js b/resources/js/helpers/ValidatorHelpers.js index 3d87fef5..e558bbb1 100644 --- a/resources/js/helpers/ValidatorHelpers.js +++ b/resources/js/helpers/ValidatorHelpers.js @@ -10,6 +10,11 @@ const ValidatorHelpers = { // Get max team members limitations let limit = store.getters.user.data.meta.limitations.max_team_members + // Unlimited option + if (limit.total === -1) { + return false + } + // Get emails from invitations and currently active members let newInvitationEmails = invitations.map((item) => item['email']) let allowedMemberEmails = limit.meta.allowed_emails diff --git a/src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php b/src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php index bf8ccaf4..c34913bd 100644 --- a/src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php +++ b/src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php @@ -10,6 +10,11 @@ class CheckMaxTeamMembersLimitAction // Get user limitation summary $limits = $user->limitations->summary(); + // Check unlimited option + if ((int) $limits['max_team_members']['total'] === -1) { + return true; + } + // Get currently used member emails $allowedEmails = $limits['max_team_members']['meta']['allowed_emails'];