Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-10-18 15:53:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: Fix values, remove use of __None

Browse Source
This commit is contained in:
rubenwardy 2024-06-11 21:35:20 +01:00
parent e75f2f92e2
commit 2c8b751f98
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/blueprints/packages/advanced_search.py
View File

@ -51,21 +51,28 @@ def get_hide_choices():
class AdvancedSearchForm(FlaskForm): class AdvancedSearchForm(FlaskForm):
q = StringField(lazy_gettext("Query"), [Optional()]) q = StringField(lazy_gettext("Query"), [Optional()])
type = SelectMultipleField(lazy_gettext("Type"), [Optional()], choices=PackageType.choices(), type = SelectMultipleField(lazy_gettext("Type"), [Optional()],
coerce=PackageType.coerce) choices=PackageType.choices(), coerce=PackageType.coerce)
author = StringField(lazy_gettext("Author"), [Optional()]) author = StringField(lazy_gettext("Author"), [Optional()])
tag = QuerySelectMultipleField(lazy_gettext('Tags'), tag = QuerySelectMultipleField(lazy_gettext('Tags'),
query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)),
get_pk=lambda a: a.id, get_label=make_label) get_pk=lambda a: a.name, get_label=make_label)
flag = QuerySelectMultipleField(lazy_gettext('Content Warnings'), query_factory=lambda: ContentWarning.query.order_by(db.asc(ContentWarning.name)), get_pk=lambda a: a.id, get_label=make_label) flag = QuerySelectMultipleField(lazy_gettext('Content Warnings'),
license = QuerySelectMultipleField(lazy_gettext("License"), [Optional()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name) query_factory=lambda: ContentWarning.query.order_by(db.asc(ContentWarning.name)),
get_pk=lambda a: a.name, get_label=make_label)
license = QuerySelectMultipleField(lazy_gettext("License"), [Optional()],
query_factory=lambda: License.query.order_by(db.asc(License.name)),
allow_blank=True, blank_value="",
get_pk=lambda a: a.name, get_label=lambda a: a.name)
game = StringField(lazy_gettext("Supports Game"), [Optional()]) game = StringField(lazy_gettext("Supports Game"), [Optional()])
lang = QuerySelectField(lazy_gettext("Language"), allow_blank=True, lang = QuerySelectField(lazy_gettext("Language"),
query_factory=lambda: Language.query.order_by(db.asc(Language.title)), query_factory=lambda: Language.query.order_by(db.asc(Language.title)),
allow_blank=True, blank_value="",
get_pk=lambda a: a.id, get_label=lambda a: a.title) get_pk=lambda a: a.id, get_label=lambda a: a.title)
hide = SelectMultipleField(lazy_gettext("Hide Tags and Content Warnings"), [Optional()]) hide = SelectMultipleField(lazy_gettext("Hide Tags and Content Warnings"), [Optional()])
engine_version = QuerySelectField(lazy_gettext("Minetest Version"), allow_blank=True, engine_version = QuerySelectField(lazy_gettext("Minetest Version"),
query_factory=lambda: MinetestRelease.query.order_by(db.asc(MinetestRelease.id)), query_factory=lambda: MinetestRelease.query.order_by(db.asc(MinetestRelease.id)),
allow_blank=True, blank_value="",
get_pk=lambda a: a.value, get_label=lambda a: a.name) get_pk=lambda a: a.value, get_label=lambda a: a.name)
sort = SelectField(lazy_gettext("Sort by"), [Optional()], choices=[ sort = SelectField(lazy_gettext("Sort by"), [Optional()], choices=[
("", ""), ("", ""),

4
app/querybuilder.py
View File

@ -163,7 +163,7 @@ class QueryBuilder:
protocol_version = get_int_or_abort(args.get("protocol_version")) protocol_version = get_int_or_abort(args.get("protocol_version"))
minetest_version = args.get("engine_version") minetest_version = args.get("engine_version")
if minetest_version == "__None": if minetest_version == "":
minetest_version = None minetest_version = None
if protocol_version or minetest_version: if protocol_version or minetest_version:
@ -187,7 +187,7 @@ class QueryBuilder:
self.game = None self.game = None
self.has_lang = args.get("lang") self.has_lang = args.get("lang")
if self.has_lang == "__None": if self.has_lang == "":
self.has_lang = None self.has_lang = None
if cookies and request.cookies.get("hide_nonfree") == "1": if cookies and request.cookies.get("hide_nonfree") == "1":