X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5dd1249f3ec74643957202977f92e42be78f65d8..35336cd73e444534cb2eda20e3730464cc4e6553:/apps/workbench/app/controllers/application_controller.rb diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb index 8d23c71a73..61351d6449 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -1,9 +1,12 @@ class ApplicationController < ActionController::Base + 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] theme :select_theme begin @@ -21,6 +24,7 @@ class ApplicationController < ActionController::Base def unprocessable(message=nil) @errors ||= [] + @errors << message if message render_error status: 422 end @@ -53,12 +57,12 @@ class ApplicationController < ActionController::Base self.render_error status: 404 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 } + f.js { render } end end @@ -75,6 +79,7 @@ class ApplicationController < ActionController::Base redirect_to params[:return_to] || @object end } + f.js { render } end end @@ -103,14 +108,27 @@ class ApplicationController < ActionController::Base 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 - redirect_to(params[:return_to] || :back) + respond_to do |f| + f.json { render json: @object } + f.html { + redirect_to(params[:return_to] || :back) + } + f.js { render } + end else self.render_error status: 422 end @@ -134,6 +152,14 @@ class ApplicationController < ActionController::Base (@object.friendly_link_name if @object.respond_to? :friendly_link_name)) end + def index_pane_list + %w(Recent) + end + + def show_pane_list + %w(Attributes Metadata JSON API) + end + protected def find_object_by_uuid @@ -150,7 +176,9 @@ class ApplicationController < ActionController::Base def thread_clear Thread.current[:arvados_api_token] = nil Thread.current[:user] = nil + Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/) yield + Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/) end def thread_with_api_token(login_optional = false) @@ -218,9 +246,22 @@ class ApplicationController < ActionController::Base 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 @@ -267,4 +308,62 @@ class ApplicationController < ActionController::Base def select_theme return Rails.configuration.arvados_theme end + + @@notification_tests = [] + + @@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/ssh_key_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 + return nil + end + return lambda { |view| + view.render partial: 'notifications/collections_notification' + } + } + + @@notification_tests.push lambda { |controller, current_user| + PipelineInstance.limit(1).where(created_by: current_user.uuid).each do + return nil + end + return lambda { |view| + view.render partial: 'notifications/pipelines_notification' + } + } + + def check_user_notifications + @notification_count = 0 + @notifications = [] + + if current_user + @showallalerts = false + @@notification_tests.each do |t| + a = t.call(self, current_user) + if a + @notification_count += 1 + @notifications.push a + end + end + end + + if @notification_count == 0 + @notification_count = '' + end + end end