diff --git a/Gemfile.lock b/Gemfile.lock index 1cdfabee0..b7b7301d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -541,9 +541,9 @@ GEM net-smtp marcel (1.0.4) maxminddb (0.1.22) - meta_request (0.8.3) + meta_request (0.8.5) rack-contrib (>= 1.1, < 3) - railties (>= 3.0.0, < 8) + railties (>= 3.0.0, < 9) method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) diff --git a/enterprise/app/fields/account_limits_field.rb b/enterprise/app/fields/account_limits_field.rb index 2a46426b7..97c5b97fd 100644 --- a/enterprise/app/fields/account_limits_field.rb +++ b/enterprise/app/fields/account_limits_field.rb @@ -2,6 +2,9 @@ require 'administrate/field/base' class AccountLimitsField < Administrate::Field::Base def to_s - data.present? ? data.to_json : { agents: nil, inboxes: nil, captain_responses: nil, captain_documents: nil, emails: nil }.to_json + defaults = { agents: nil, inboxes: nil, captain_responses: nil, captain_documents: nil, emails: nil } + overrides = (data.presence || {}).to_h.symbolize_keys.compact + + defaults.merge(overrides).to_json end end