diff --git a/app/models/item.rb b/app/models/item.rb index cef09f8d..8be75718 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -23,6 +23,8 @@ class Item < ApplicationRecord has_many :dyeworks_variants, class_name: "Item", inverse_of: :dyeworks_base_item + validates_presence_of :name, :description, :thumbnail_url, :rarity, :price, + :zones_restrict attr_writer :current_body_id, :owned, :wanted diff --git a/app/models/item/dyeworks.rb b/app/models/item/dyeworks.rb index 06a07109..79a7b9de 100644 --- a/app/models/item/dyeworks.rb +++ b/app/models/item/dyeworks.rb @@ -117,7 +117,7 @@ class Item )\z }x def inferred_dyeworks_base_item - name_match = name.match(DYEWORKS_NAME_PATTERN) + name_match = (name || "").match(DYEWORKS_NAME_PATTERN) return nil if name_match.nil? Item.find_by_name(name_match["base"])