From 55494c30bba3fc5b4062ae644dbcb8932dae3568 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 15 Jun 2016 13:03:29 -0700 Subject: [PATCH] show error messages on bur failures --- app/controllers/bulk_update_requests_controller.rb | 1 - app/views/bulk_update_requests/approve.js.erb | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/bulk_update_requests_controller.rb b/app/controllers/bulk_update_requests_controller.rb index 052fca25c..787893783 100644 --- a/app/controllers/bulk_update_requests_controller.rb +++ b/app/controllers/bulk_update_requests_controller.rb @@ -32,7 +32,6 @@ class BulkUpdateRequestsController < ApplicationController def approve @bulk_update_request.approve!(CurrentUser.user.id) - flash[:notice] = "Bulk update request approved" respond_with(@bulk_update_request, :location => bulk_update_requests_path) end diff --git a/app/views/bulk_update_requests/approve.js.erb b/app/views/bulk_update_requests/approve.js.erb index 01a0282bd..9f03d78c1 100644 --- a/app/views/bulk_update_requests/approve.js.erb +++ b/app/views/bulk_update_requests/approve.js.erb @@ -1 +1,5 @@ -$("#request-status-for-<%= @bulk_update_request.id %>").html("queued"); +<% if @bulk_update_request.errors.any? %> + Danbooru.error(<%= j @bulk_update_request.errors.full_messages.join(',') %>); +<% else %> + $("#request-status-for-<%= @bulk_update_request.id %>").html("queued"); +<% end %>