diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index cafda40ba..11ddb9927 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -58,6 +58,8 @@ class BulkUpdateRequest < ActiveRecord::Base msg += "#{line}\n" end + self.approver_id = User.admins.first.id if approver.nil? + dmail = Dmail.new( :from_id => approver.id, :to_id => approver.id, diff --git a/lib/danbooru_image_resizer/danbooru_image_resizer.rb b/lib/danbooru_image_resizer/danbooru_image_resizer.rb index ac36cead7..93858a83d 100644 --- a/lib/danbooru_image_resizer/danbooru_image_resizer.rb +++ b/lib/danbooru_image_resizer/danbooru_image_resizer.rb @@ -15,6 +15,7 @@ module Danbooru end image = flatten(image, width, height) + image.strip! image.write(write_path) do self.quality = resize_quality diff --git a/test/functional/bulk_update_requests_controller_test.rb b/test/functional/bulk_update_requests_controller_test.rb index f3c40980d..6b30cb058 100644 --- a/test/functional/bulk_update_requests_controller_test.rb +++ b/test/functional/bulk_update_requests_controller_test.rb @@ -106,7 +106,7 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase end end - context "1234 for an admin" do + context "for an admin" do should "succeed" do post :approve, {:id => @bulk_update_request.id}, {:user_id => @admin.id} @bulk_update_request.reload