From 5b2fcaaafcfcc498863e909622272adabf3740ba Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 14 Feb 2022 16:00:22 -0600 Subject: [PATCH] uploads: default to only showing completed uploads. Default to only showing completed uploads on the My Uploads page, not failed or processing uploads. --- app/controllers/uploads_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 8fb9a3cd7..16a40a76b 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -30,10 +30,10 @@ class UploadsController < ApplicationController def index @mode = params.fetch(:mode, "table") - @uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true) - @uploads = @uploads.includes(:uploader, upload_media_assets: { media_asset: :post }) if request.format.html? - + @defaults = { defaults: { status: "completed" }} if request.format.html? + @uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true, **@defaults.to_h) @uploads = @uploads.includes(:uploader, media_assets: :post, upload_media_assets: { media_asset: :post }) if request.format.html? + respond_with(@uploads, include: { upload_media_assets: { include: :media_asset }}) end