accept_attribute_as_json :command, Array
accept_attribute_as_json :scheduling_parameters, Hash
- skip_before_filter :find_object_by_uuid, only: [:current]
- skip_before_filter :render_404_if_no_object, only: [:current]
+ skip_before_action :find_object_by_uuid, only: [:current]
+ skip_before_action :render_404_if_no_object, only: [:current]
def auth
if @object.locked_by_uuid != Thread.current[:api_client_authorization].uuid
end
def update
- @object.with_lock do
- @object.reload
+ @object.reload.with_lock do
super
end
end
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
- @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid)
+ @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid, :lock_count)
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end
if Thread.current[:api_client_authorization].nil?
send_error("Not logged in", status: 401)
else
- c = Container.for_current_token
- if c.nil? or c.first.nil?
+ @object = Container.for_current_token
+ if @object.nil?
send_error("Token is not associated with a container.", status: 404)
else
- @object = c.first
show
end
end
end
def secret_mounts
- if @object &&
- @object.auth_uuid &&
- @object.auth_uuid == Thread.current[:api_client_authorization].uuid
+ c = Container.for_current_token
+ if @object && c && @object.uuid == c.uuid
send_json({"secret_mounts" => @object.secret_mounts})
else
send_error("Token is not associated with this container.", status: 403)