Fix item loading

paradisec-archive · Jan 19, 2024 · 00022db · 00022db
1 parent fd88ee8
commit 00022db
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
@@ -352,15 +352,18 @@ def find_by_full_identifier
 
   # So we can include things and solve N + 1 queries
   def find_item
-    @item = Item.includes([
-                            { item_agents: %i[agent_role user] },
-                            { item_admins: %i[user] },
-                            :collection,
-                            :essences,
-                            :item_countries,
-                            :item_subject_languages,
-                            :item_content_languages
-                          ]).find_by(identifier: params[:id])
+    @collection = Collection.find_by(identifier: params[:collection_id])
+    @item = @collection.items
+      .includes([
+        { item_agents: %i[agent_role user] },
+        { item_admins: %i[user] },
+        :collection,
+        :essences,
+        :item_countries,
+        :item_subject_languages,
+        :item_content_languages
+      ])
+      .find_by(identifier: params[:id])
   end
 
   def save_item_catalog_file(item)