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
end
def index
- @objects ||= model_class.limit(1000).all
+ @objects ||= model_class.limit(200).all
respond_to do |f|
f.json { render json: @objects }
f.html { render }
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)
+ end
+
+ def show_pane_list
+ %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
}
}
- @@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|
if @notification_count == 0
@notification_count = ''
end
-
- # @my_ssh_keys = AuthorizedKey.where(authorized_user_uuid: current_user.uuid)
- # @my_vm_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#virtual_machine', link_class: 'permission', name: 'can_login')
- # @my_repo_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#repository', link_class: 'permission', name: 'can_write')
-
- # @my_tag_links = {}
-
- # @my_jobs = Job.
- # limit(10).
- # order('created_at desc').
- # where(created_by: current_user.uuid)
-
- # @my_collections = Collection.
- # limit(10).
- # order('created_at desc').
- # where(created_by: current_user.uuid)
-
- # Link.limit(1000).where(head_uuid: @my_collections.collect(&:uuid),
- # link_class: 'tag').each do |link|
- # (@my_tag_links[link.head_uuid] ||= []) << link
- # end
-
- # @my_pipelines = PipelineInstance.
- # limit(10).
- # order('created_at desc').
- # where(created_by: current_user.uuid)
-
-
-
end
end