fix collection preview to match order

Captain-Wet-Beard · Sep 28, 2021 · c9dd3c7 · c9dd3c7
1 parent 91c8c2b
commit c9dd3c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/mariadbplugin/CollectionFunctions.go b/plugins/mariadbplugin/CollectionFunctions.go
@@ -80,10 +80,10 @@ func (DBConnection *MariaDBPlugin) GetCollections(PageStart uint64, PageStride u
 	) Counts ON Counts.CollectionID = CL.ID
 	-- This part gets a preview image location
 	LEFT JOIN (
-		SELECT Location, CollectionMembers.CollectionID as CollectionID, MIN(CollectionMembers.OrderWeight)
-		FROM Images
-		INNER JOIN CollectionMembers ON CollectionMembers.ImageID = Images.ID
-		GROUP BY CollectionMembers.CollectionID
+		SELECT CM.CollectionID as CollectionID, Images.Location as Location
+		FROM CollectionMembers as CM
+		INNER JOIN Images on Images.ID = CM.ImageID
+		WHERE OrderWeight = (SELECT MIN(OrderWeight) From CollectionMembers WHERE CollectionMembers.CollectionID = CM.CollectionID)
 	) Preview ON Preview.CollectionID = CL.ID
 	ORDER BY Name
 	LIMIT ? OFFSET ?;`

diff --git a/plugins/mariadbplugin/CollectionSearch.go b/plugins/mariadbplugin/CollectionSearch.go
@@ -92,10 +92,10 @@ func (DBConnection *MariaDBPlugin) SearchCollections(Tags []interfaces.TagInform
 		GROUP BY CollectionID
 	) Counts ON Counts.CollectionID = ID
 	LEFT JOIN (
-		SELECT Location, CollectionMembers.CollectionID as CollectionID, MIN(CollectionMembers.OrderWeight)
-		FROM Images
-		INNER JOIN CollectionMembers ON CollectionMembers.ImageID = Images.ID
-		GROUP BY CollectionMembers.CollectionID
+		SELECT CM.CollectionID as CollectionID, Images.Location as Location
+		FROM CollectionMembers as CM
+		INNER JOIN Images on Images.ID = CM.ImageID
+		WHERE OrderWeight = (SELECT MIN(OrderWeight) From CollectionMembers WHERE CollectionMembers.CollectionID = CM.CollectionID)
 	) Preview ON Preview.CollectionID = ID `
 
 	if len(IncludeTags) > 0 {