LibreGaming
/
contentdb
14
0
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

Fix crash on invalid protocol_version

This commit is contained in:
rubenwardy 2020-05-19 16:39:39 +01:00
parent c15dd183a0
commit ffb5b49521
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/querybuilder.py
View File

@ -1,6 +1,6 @@
from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag
from .models import tags as Tags from .models import tags as Tags
from .utils import isNo, isYes 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
from sqlalchemy import or_ from sqlalchemy import or_
@ -61,7 +61,7 @@ class QueryBuilder:
if not self.protocol_version: if not self.protocol_version:
return None return None
self.protocol_version = int(self.protocol_version) self.protocol_version = get_int_or_abort(self.protocol_version)
version = MinetestRelease.query.filter(MinetestRelease.protocol>=self.protocol_version).first() version = MinetestRelease.query.filter(MinetestRelease.protocol>=self.protocol_version).first()
if version is not None: if version is not None:
return version.id return version.id
@ -139,7 +139,6 @@ class QueryBuilder:
query = query.order_by(db.desc(ForumTopic.views)) query = query.order_by(db.desc(ForumTopic.views))
elif self.order_by == "date": elif self.order_by == "date":
query = query.order_by(db.asc(ForumTopic.created_at)) query = query.order_by(db.asc(ForumTopic.created_at))
sort_by = "date"
if self.search: if self.search:
query = query.filter(ForumTopic.title.ilike('%' + self.search + '%')) query = query.filter(ForumTopic.title.ilike('%' + self.search + '%'))