Merge commit 'refs/pull/1813/head' of https://github.com/xbapps/xbvr …

…into impatient
vt-idiot · Aug 4, 2024 · 2e34422 · 2e34422
2 parents a66d5c4 + 4d92cc3
commit 2e34422
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/models/model_scene.go b/pkg/models/model_scene.go
@@ -1148,6 +1148,8 @@ func queryScenes(db *gorm.DB, r RequestSceneList) (*gorm.DB, *gorm.DB) {
 		}
 	case "scene_id_desc":
 		tx = tx.Order("scene_id desc")
+	case "site_asc":
+		tx = tx.Order("scenes.site")
 	case "random":
 		if dbConn.Driver == "mysql" {
 			tx = tx.Order("rand()")

diff --git a/ui/src/views/scenes/Filters.vue b/ui/src/views/scenes/Filters.vue
@@ -57,6 +57,7 @@
             <option value="last_opened_asc">↑ {{ $t("Last viewed date") }}</option>
             <option value="script_published_desc">↓ {{ $t("Published Script Added") }}</option>
             <option value="scene_id_desc">↓ {{ $t("Scene Id") }}</option>
+            <option value="site_asc">↑ {{ $t("Site") }}</option>
             <option value="alt_src_desc">↓ {{ $t("Linked to Alternate Sites") }}</option>
             <option value="random">↯ {{ $t("Random") }}</option>
           </select>