Merge branch 'main' into glitch-soc/merge-upstream

2021-08-11 16:41:59 +02:00
parent 70b7ac9ff3 13b08610a0
commit 47ea9b2d67
6 changed files with 11 additions and 6 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -299,7 +299,11 @@ class Account < ApplicationRecord
  end

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

  def fields_attributes=(attributes)