From 1053d49a1118beb2ecaca5b4366ff7ec0f84f64f Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 31 Mar 2023 23:31:27 -0700 Subject: [PATCH] add basil images to user#content indexes --- app/controllers/users_controller.rb | 6 ++++++ app/views/content/list/_cards.html.erb | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a9d53fc6..996d6f37 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -36,6 +36,12 @@ class UsersController < ApplicationController @content_type = content_type @content_list = @user.send(content_type_name).is_public.order(:name) + @saved_basil_commissions = BasilCommission.where( + entity_type: content_type_name, + entity_id: @content_list.pluck(:id) + ).where.not(saved_at: nil) + .group_by { |commission| [commission.entity_type, commission.entity_id] } + render :content_list end end diff --git a/app/views/content/list/_cards.html.erb b/app/views/content/list/_cards.html.erb index 1249bb8c..8e70fb34 100644 --- a/app/views/content/list/_cards.html.erb +++ b/app/views/content/list/_cards.html.erb @@ -5,10 +5,12 @@ .sample .try(:src, :medium) - content_image ||= @saved_basil_commissions.fetch([content.page_type, content.id], []) - .sample - .try(:image) - .try(:url) + if @saved_basil_commissions + content_image ||= @saved_basil_commissions.fetch([content.page_type, content.id], []) + .sample + .try(:image) + .try(:url) + end content_image ||= asset_path("card-headers/#{content.page_type.downcase.pluralize}.jpg") %>