From f78dc1712ca302ab558f1d930896fde18e313032 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Tue, 22 Sep 2026 19:19:15 +0930 Subject: [PATCH] Paginate garden photos and limit plantings in garden views (#4830) Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Brenda Wallace --- app/controllers/gardens_controller.rb | 1 + app/views/gardens/_card.html.haml | 4 ++-- app/views/gardens/show.html.haml | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 17e78be85..916fe271c 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -39,6 +39,7 @@ class GardensController < DataController @suggested_companions = Crop.approved.where( id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id) ).order(:name) + @photos = @garden.photos.includes(:owner).order(created_at: :desc, id: :desc).paginate(page: params[:page]) respond_with(@garden) end diff --git a/app/views/gardens/_card.html.haml b/app/views/gardens/_card.html.haml index d30454554..be889f3fa 100644 --- a/app/views/gardens/_card.html.haml +++ b/app/views/gardens/_card.html.haml @@ -21,7 +21,7 @@ %section - if active_plantings.perennial.any? %strong Perennials: - - active_plantings.perennial.each do |planting| + - active_plantings.perennial.limit(10).each do |planting| = link_to planting do = crop_icon planting.crop = planting.crop @@ -32,6 +32,6 @@ %section - if active_plantings.annual.any? - = render 'plantings/progress_list', plantings: garden.plantings.active.annual + = render 'plantings/progress_list', plantings: active_plantings.annual.limit(5) - else %p No annual plantings diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index e8117a7a0..3a1c26ceb 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -49,7 +49,7 @@ %section.card %h2 Garden progress .card-body - = render 'plantings/progress_list', plantings: @garden.plantings.active + = render 'plantings/progress_list', plantings: @garden.plantings.active.limit(10) %section %h2 Current plantings in garden @@ -177,9 +177,10 @@ %%p = add_photo_button(@garden) - - if @garden.photos.size.positive? + - if @photos.present? && @photos.any? %section.photos %h2= localize_plural(@garden.photos, Photo) .index-cards - - @garden.photos.includes(:owner).each do |photo| + - @photos.each do |photo| = render 'photos/thumbnail', photo: photo + = will_paginate @photos