X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ad8e91c2c580b2a6188fccafb05672b7130ec931..cf7e30873ef4b92cc8ec099b2bb344391a070e93:/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 162fd28705..6b0492a90f 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -24,6 +24,7 @@ class ApplicationController < ActionController::Base def unprocessable(message=nil) @errors ||= [] + @errors << message if message render_error status: 422 end @@ -107,10 +108,11 @@ class ApplicationController < ActionController::Base end def create - @object ||= model_class.new params[model_class.to_s.underscore.singularize.to_sym] + @object ||= model_class.new params[model_class.to_s.underscore.singularize] @object.save! respond_to do |f| + f.json { render json: @object } f.html { redirect_to(params[:return_to] || @object) } @@ -121,6 +123,7 @@ class ApplicationController < ActionController::Base def destroy if @object.destroy respond_to do |f| + f.json { render json: @object } f.html { redirect_to(params[:return_to] || :back) } @@ -146,7 +149,8 @@ class ApplicationController < ActionController::Base 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 @@ -317,14 +321,14 @@ class ApplicationController < ActionController::Base } } - @@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