Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fulltext search order being overriden

Browse Source
This commit is contained in:
rubenwardy
2020-07-12 17:52:15 +01:00
parent f437850a50
commit 2e6f99d09e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/querybuilder.py
View File

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