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

Add support for multiple types in packages list

Browse Source
This commit is contained in:
rubenwardy 2018-07-28 18:12:22 +01:00
parent 404200b8f0
commit a3e82ad42f
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models.py
View File

@ -211,6 +211,13 @@ class PackageType(enum.Enum):
def __str__(self):
return self.name
@classmethod
def get(cls, name):
try:
return PackageType[name.upper()]
except KeyError:
return None
@classmethod
def choices(cls):
return [(choice, choice.value) for choice in cls]

20
app/views/packages/__init__.py
View File

@ -29,20 +29,22 @@ from flask_wtf import FlaskForm
from wtforms import *
from wtforms.validators import *
from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
from sqlalchemy import or_
from sqlalchemy import or_, any_
def build_packages_query():
type_name = request.args.get("type")
type = None
if type_name is not None:
type = PackageType[type_name.upper()]
title = "Packages"
query = Package.query.filter_by(soft_deleted=False, approved=True)
if type is not None:
title = type.value + "s"
query = query.filter_by(type=type)
# Filter by requested type(s)
types = request.args.getlist("type")
types = [PackageType.get(tname) for tname in types]
types = [type for type in types if type is not None]
if len(types) > 0:
title = ", ".join([type.value + "s" for type in types])
query = query.filter(Package.type.in_(types))
search = request.args.get("q")
if search is not None and search.strip() != "":