Combine doPackageList function and /packages/ endpoint
This commit is contained in:
parent
7217353bdb
commit
167a9f14cd
|
@ -16,7 +16,15 @@ from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleF
|
||||||
# TODO: the following could be made into one route, except I"m not sure how
|
# TODO: the following could be made into one route, except I"m not sure how
|
||||||
# to do the menu
|
# to do the menu
|
||||||
|
|
||||||
def doPackageList(type):
|
@menu.register_menu(app, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
|
||||||
|
@menu.register_menu(app, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' })
|
||||||
|
@menu.register_menu(app, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' })
|
||||||
|
@app.route("/packages/")
|
||||||
|
def packages_page():
|
||||||
|
type = request.args.get("type")
|
||||||
|
if type is not None:
|
||||||
|
type = PackageType[type.upper()]
|
||||||
|
|
||||||
title = "Packages"
|
title = "Packages"
|
||||||
query = Package.query
|
query = Package.query
|
||||||
|
|
||||||
|
@ -38,17 +46,6 @@ def doPackageList(type):
|
||||||
query=search, tags=tags, type=None if type is None else type.toName())
|
query=search, tags=tags, type=None if type is None else type.toName())
|
||||||
|
|
||||||
|
|
||||||
@menu.register_menu(app, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
|
|
||||||
@menu.register_menu(app, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' })
|
|
||||||
@menu.register_menu(app, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' })
|
|
||||||
@app.route("/packages/")
|
|
||||||
def packages_page():
|
|
||||||
type = None
|
|
||||||
typeStr = request.args.get("type")
|
|
||||||
if typeStr is not None:
|
|
||||||
type = PackageType[typeStr.upper()]
|
|
||||||
return doPackageList(type)
|
|
||||||
|
|
||||||
def canSeeWorkQueue():
|
def canSeeWorkQueue():
|
||||||
return Permission.APPROVE_NEW.check(current_user) or \
|
return Permission.APPROVE_NEW.check(current_user) or \
|
||||||
Permission.APPROVE_RELEASE.check(current_user) or \
|
Permission.APPROVE_RELEASE.check(current_user) or \
|
||||||
|
|
Loading…
Reference in New Issue