fix: Update account limit selection logic (#6149)

2022-12-29 19:37:36 -08:00
parent e5fd866a7c
commit 11f6e6bc61
2 changed files with 27 additions and 1 deletions
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -15,7 +15,11 @@ module Enterprise::Account

  def get_limits(limit_name)
    config_name = "ACCOUNT_#{limit_name.to_s.upcase}_LIMIT"
-    self[:limits][limit_name.to_s] || GlobalConfig.get(config_name)[config_name] || ChatwootApp.max_limit
+    return self[:limits][limit_name.to_s] if self[:limits][limit_name.to_s].present?
+
+    return GlobalConfig.get(config_name)[config_name] if GlobalConfig.get(config_name)[config_name].present?
+
+    ChatwootApp.max_limit
  end

  def validate_limit_keys