end
def render_error(opts)
+ opts = {status: 500}.merge opts
respond_to do |f|
# json must come before html here, so it gets used as the
# default format when js is requested by the client. This lets
def update
updates = params[@object.class.to_s.underscore.singularize.to_sym]
updates.keys.each do |attr|
- if @object.send(attr).is_a? Hash and updates[attr].is_a? String
- updates[attr] = Oj.load updates[attr]
+ if @object.send(attr).is_a? Hash
+ if updates[attr].is_a? String
+ updates[attr] = Oj.load updates[attr]
+ end
+ if params[:merge] || params["merge_#{attr}".to_sym]
+ # Merge provided Hash with current Hash, instead of
+ # replacing.
+ updates[attr] = @object.send(attr).with_indifferent_access.
+ deep_merge(updates[attr].with_indifferent_access)
+ end
end
end
if @object.update_attributes updates