Merge pull request #246 from RickCarlino/master

Fixes FarmBot/farmbot-web-frontend#57
pull/249/head
Rick Carlino 2016-05-04 11:02:12 -05:00
commit 2e8ab81aa3
2 changed files with 6 additions and 2 deletions

View File

@ -16,10 +16,13 @@ module Api
end
def update
# FIXME Need to determine if we're nesting or not. This is a hack:
params[:sequence][:steps] ||= params[:steps]
# This is a mess because of some Rails security precautions that are not
# relevant to this use case:
# http://guides.rubyonrails.org/security.html#unsafe-query-generation
steps = JSON.parse(request.body.read)["steps"]
mutate Sequences::Update.run(params[:sequence],
user: current_user,
steps: steps,
sequence: sequence)
end

View File

@ -14,6 +14,7 @@ module Sequences
end
def validate
add_error(:steps, :empty, "Can't be blank") if steps == []
raise Errors::Forbidden unless sequence.device.users.include?(user)
end