From bca483cefd22123b4da829a0b3bd93d9c20ad8d4 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 12 Apr 2018 22:14:06 -0500 Subject: [PATCH] Fix #3628: Retry button is displayed for failed uploads that cannot succeed even if retried --- app/controllers/uploads_controller.rb | 6 ------ app/views/uploads/show.html.erb | 5 ----- test/functional/uploads_controller_test.rb | 14 -------------- 3 files changed, 25 deletions(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index dd55d2ad6..9821ab9f1 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -66,12 +66,6 @@ class UploadsController < ApplicationController respond_with(@upload) end - def update - @upload = Upload.find(params[:id]) - @upload.process! - respond_with(@upload) - end - private def find_post_by_url(normalized_url) diff --git a/app/views/uploads/show.html.erb b/app/views/uploads/show.html.erb index c32f2fdaf..ff94591db 100644 --- a/app/views/uploads/show.html.erb +++ b/app/views/uploads/show.html.erb @@ -25,11 +25,6 @@ <% end %> <% end %> - <% if @upload.is_downloadable? %> - <%= form_tag(upload_path(@upload), :method => :put) do %> - <% submit_tag "Retry" %> - <% end %> - <% end %> <% end %>

diff --git a/test/functional/uploads_controller_test.rb b/test/functional/uploads_controller_test.rb index 56803c936..df1ec5bbc 100644 --- a/test/functional/uploads_controller_test.rb +++ b/test/functional/uploads_controller_test.rb @@ -94,19 +94,5 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest end end end - - context "update action" do - setup do - as_user do - @upload = create(:source_upload) - end - end - - should "process an unapproval" do - put_auth upload_path(@upload), @user - @upload.reload - assert_equal("completed", @upload.status) - end - end end end