respond_to :html, :json, :js
protect_from_forgery
around_filter :thread_clear
- around_filter :thread_with_api_token, :except => [:render_exception, :render_not_found]
+ around_filter :thread_with_mandatory_api_token, :except => [:render_exception, :render_not_found]
+ around_filter :thread_with_optional_api_token
before_filter :find_object_by_uuid, :except => [:index, :render_exception, :render_not_found]
before_filter :check_user_agreements, :except => [:render_exception, :render_not_found]
before_filter :check_user_notifications, :except => [:render_exception, :render_not_found]
def unprocessable(message=nil)
@errors ||= []
+
@errors << message if message
render_error status: 422
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
end
def index
- @objects ||= model_class.limit(1000).all
+ if params[:limit]
+ limit = params[:limit].to_i
+ else
+ limit = 200
+ end
+
+ if params[:offset]
+ offset = params[:offset].to_i
+ else
+ offset = 0
+ end
+
+ @objects ||= model_class.limit(limit).offset(offset).all
respond_to do |f|
f.json { render json: @objects }
f.html { render }
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
end
def create
- @object ||= model_class.new params[model_class.to_s.singularize.to_sym]
+ @object ||= model_class.new params[model_class.to_s.underscore.singularize]
@object.save!
- redirect_to(params[:return_to] || @object)
+
+ respond_to do |f|
+ f.json { render json: @object }
+ f.html {
+ redirect_to(params[:return_to] || @object)
+ }
+ f.js { render }
+ end
end
def destroy
if @object.destroy
respond_to do |f|
+ f.json { render json: @object }
f.html {
redirect_to(params[:return_to] || :back)
}
def breadcrumb_page_name
(@breadcrumb_page_name ||
- (@object.friendly_link_name if @object.respond_to? :friendly_link_name))
+ (@object.friendly_link_name if @object.respond_to? :friendly_link_name) ||
+ action_name)
end
def index_pane_list
- %w(recent)
+ %w(Recent)
end
def show_pane_list
- %w(attributes metadata json api)
+ %w(Attributes Metadata JSON API)
end
protected
end
end
- def thread_with_optional_api_token
- thread_with_api_token(true) do
+ def thread_with_mandatory_api_token
+ thread_with_api_token do
yield
end
end
+ # This runs after thread_with_mandatory_api_token in the filter chain.
+ def thread_with_optional_api_token
+ if Thread.current[:arvados_api_token]
+ # We are already inside thread_with_mandatory_api_token.
+ yield
+ else
+ # We skipped thread_with_mandatory_api_token. Use the optional version.
+ thread_with_api_token(true) do
+ yield
+ end
+ end
+ end
+
def verify_api_token
begin
Link.where(uuid: 'just-verifying-my-api-token')
}
}
- @@notification_tests.push lambda { |controller, current_user|
- AuthorizedKey.limit(1).where(authorized_user_uuid: current_user.uuid).each do
- return nil
- end
- return lambda { |view|
- view.render partial: 'notifications/jobs_notification'
- }
- }
-
- @@notification_tests.push lambda { |controller, current_user|
- Job.limit(1).where(created_by: current_user.uuid).each do
- return nil
- end
- return lambda { |view|
- view.render partial: 'notifications/jobs_notification'
- }
- }
+ #@@notification_tests.push lambda { |controller, current_user|
+ # Job.limit(1).where(created_by: current_user.uuid).each do
+ # return nil
+ # end
+ # return lambda { |view|
+ # view.render partial: 'notifications/jobs_notification'
+ # }
+ #}
@@notification_tests.push lambda { |controller, current_user|
- Collection.limit(1).where(created_by: current_user.uuid).each do
+ Collection.limit(1).where(created_by: current_user.uuid).each do
return nil
end
return lambda { |view|
}
@@notification_tests.push lambda { |controller, current_user|
- PipelineInstance.limit(1).where(created_by: current_user.uuid).each do
+ PipelineInstance.limit(1).where(created_by: current_user.uuid).each do
return nil
end
return lambda { |view|