fix(galleries): make some queries more efficient (#1098)

* Update GalleryController.php * Update gallery.blade.php
corowne · Oct 29, 2024 · 9675699 · 9675699
1 parent 79397de
commit 9675699
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/Http/Controllers/GalleryController.php b/app/Http/Controllers/GalleryController.php
@@ -99,7 +99,7 @@ public function getGallery($id, Request $request) {
         return view('galleries.gallery', [
             'gallery'          => $gallery,
             'submissions'      => $query->paginate(20)->appends($request->query()),
-            'prompts'          => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::check() ? Auth::user() : null)->accepted()->whereNotNull('prompt_id')->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
+            'prompts'          => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::check() ? Auth::user() : null)->accepted()->whereNotNull('prompt_id')->select('prompt_id')->distinct()->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
             'childSubmissions' => GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted'),
             'galleryPage'      => true,
             'sideGallery'      => $gallery,

diff --git a/resources/views/galleries/gallery.blade.php b/resources/views/galleries/gallery.blade.php
@@ -26,7 +26,7 @@
         </p>
     @endif
     <p>{!! $gallery->description !!}</p>
-    @if (!$gallery->submissions->count() && $gallery->children->count() && $childSubmissions->count())
+    @if (!$gallery->submissions()->count() && $gallery->children->count() && $childSubmissions->count())
         <p>This gallery has no submissions; instead, displayed is a selection of the most recent submissions from its sub-galleries. Please navigate to one of the sub-galleries to view more.</p>
     @endif
 
@@ -59,7 +59,7 @@
         {!! Form::close() !!}
     </div>
 
-    @if ($gallery->submissions->count())
+    @if ($gallery->submissions()->count())
         {!! $submissions->render() !!}
 
         <div class="d-flex align-content-around flex-wrap mb-2">