From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 12 Jul 2020 16:52:15 +0000 (+0100)
Subject: Fix fulltext search order being overriden
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2e6f99d09e8bb3e7dbb5bf8e47501a58e464e157;p=cheatdb.git

Fix fulltext search order being overriden
---

diff --git a/app/querybuilder.py b/app/querybuilder.py
index d511836..84513e9 100644
--- a/app/querybuilder.py
+++ b/app/querybuilder.py
@@ -1,5 +1,4 @@
-from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag
-from .models import tags as Tags
+from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag, Tags
 from .utils import isNo, isYes, get_int_or_abort
 from sqlalchemy.sql.expression import func
 from flask import abort
@@ -77,6 +76,8 @@ class QueryBuilder:
 			query = query.order_by(func.random())
 		else:
 			to_order = None
+			if self.order_by is None and self.search:
+				pass
 			if self.order_by is None or self.order_by == "score":
 				to_order = Package.score
 			elif self.order_by == "name":