lib/sn_foil/contexts/show_context.rb in snfoil-0.8.3 vs lib/sn_foil/contexts/show_context.rb in snfoil-0.8.4
- old
+ new
@@ -27,10 +27,11 @@
end
def setup_show_object(id: nil, object: nil, **options)
raise ArgumentError, 'one of the following keywords is required: id, object' unless id || object
- options.merge! object: wrap_object(object || scope.resolve.find(id))
+ options[:object] = wrap_object(object || scope.resolve.find(id))
+ options
end
def setup_show_hooks
self.class.i_setup_show_hooks || []
end