diff --git a/app/views/bulk_update_requests/_bur_edit_links.html.erb b/app/views/bulk_update_requests/_bur_edit_links.html.erb new file mode 100644 index 000000000..fedb802e4 --- /dev/null +++ b/app/views/bulk_update_requests/_bur_edit_links.html.erb @@ -0,0 +1,11 @@ +<%# bur %> + +<% if bur.approvable?(CurrentUser.user) %> + <%= link_to "Approve", approve_bulk_update_request_path(bur), remote: true, method: :post, "data-confirm": "Are you sure you want to approve this bulk update request?" %> | +<% end %> +<% if bur.rejectable?(CurrentUser.user) %> + <%= link_to "Reject", bur, remote: true, method: :delete, "data-confirm": "Are you sure you want to reject this bulk update request?" %> | +<% end %> +<% if bur.editable?(CurrentUser.user) %> + <%= link_to "Edit", edit_bulk_update_request_path(bur), :"data-shortcut" => "e" %> +<% end %> diff --git a/app/views/bulk_update_requests/_listing.html.erb b/app/views/bulk_update_requests/_listing.html.erb index 262b973f9..590965645 100644 --- a/app/views/bulk_update_requests/_listing.html.erb +++ b/app/views/bulk_update_requests/_listing.html.erb @@ -25,15 +25,9 @@ <%= request.status %> <%= link_to "Show", bulk_update_request_path(request) %> | - <% if CurrentUser.is_admin? && request.status == "pending" %> - <%= link_to "Approve", approve_bulk_update_request_path(request), :remote => true, :method => :post %> | - <% end %> - <% if request.editable?(CurrentUser.user) %> - <%= link_to "Reject", bulk_update_request_path(request), :method => :delete, :remote => true, :data => {:confirm => "Are you sure you want to reject this bulk update request?"} %> | - <%= link_to "Edit", edit_bulk_update_request_path(request) %> - <% end %> + <%= render "bur_edit_links", bur: request %> <% end %> - \ No newline at end of file + diff --git a/app/views/bulk_update_requests/approve.js.erb b/app/views/bulk_update_requests/approve.js.erb index e6890b773..66e9a108a 100644 --- a/app/views/bulk_update_requests/approve.js.erb +++ b/app/views/bulk_update_requests/approve.js.erb @@ -1,5 +1,9 @@ <% if @bulk_update_request.errors.any? %> $(window).trigger("danbooru:error", <%= j @bulk_update_request.errors.full_messages.join(',') %>); <% else %> - $("#request-status-for-<%= @bulk_update_request.id %>").html("queued"); + if ($("#a-index").length) { + $("#request-status-for-<%= @bulk_update_request.id %>").html("queued"); + } else { + location.reload(); + } <% end %> diff --git a/app/views/bulk_update_requests/destroy.js.erb b/app/views/bulk_update_requests/destroy.js.erb index f58670fb2..35137d456 100644 --- a/app/views/bulk_update_requests/destroy.js.erb +++ b/app/views/bulk_update_requests/destroy.js.erb @@ -1 +1,5 @@ -$("#request-status-for-<%= @bulk_update_request.id %>").html("rejected"); +if ($("#a-index").length) { + $("#request-status-for-<%= @bulk_update_request.id %>").html("rejected"); +} else { + location.reload(); +} diff --git a/app/views/bulk_update_requests/show.html.erb b/app/views/bulk_update_requests/show.html.erb index bb614213f..880d7725b 100644 --- a/app/views/bulk_update_requests/show.html.erb +++ b/app/views/bulk_update_requests/show.html.erb @@ -10,15 +10,13 @@
  • Date <%= @bulk_update_request.created_at %>
  • Status: <%= @bulk_update_request.status %>
  • Estimate: <%= @bulk_update_request.estimate_update_count %>
  • - - <% if CurrentUser.is_admin? && @bulk_update_request.is_pending? %> -
  • Commands <%= link_to "Approve", approve_bulk_update_request_path(@bulk_update_request), :method => :post %>
  • - <% end %>

    Script

    <%= format_text @bulk_update_request.script_with_links %>
    + + <%= render "bur_edit_links", bur: @bulk_update_request %>
    @@ -27,4 +25,4 @@ <% content_for(:page_title) do %> Bulk Update Request - <%= Danbooru.config.app_name %> -<% end %> \ No newline at end of file +<% end %>