Merge commit 'dfa5889fc0' into kb_migration

2023-05-23 22:17:10 +09:00 · 2023-05-23 22:17:10 +09:00 · 4a19077534
commit 4a19077534
parent 809f7d888a dfa5889fc0
285 changed files with 938 additions and 822 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -378,11 +378,11 @@ class Account < ApplicationRecord
  end

  def fields
-    (self[:fields] || []).map do |f|
+    (self[:fields] || []).filter_map do |f|
      Account::Field.new(self, f)
    rescue
      nil
-    end.compact
+    end
  end

  def fields_attributes=(attributes)