diff options
| author | rubenwardy <rw@rubenwardy.com> | 2018-05-13 15:56:19 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2018-05-13 15:56:19 +0100 |
| commit | 167a9f14cdce9c01a0097e86a46e45438ed88628 (patch) | |
| tree | b749d2a3128f18babf622df810e7e1b30879a254 | |
| parent | 7217353bdb780fd096f1f036e24d9d5109a7868b (diff) | |
| download | cheatdb-167a9f14cdce9c01a0097e86a46e45438ed88628.tar.xz | |
Combine doPackageList function and /packages/ endpoint
| -rw-r--r-- | app/views/packages.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/app/views/packages.py b/app/views/packages.py index 77755c9..96e50b4 100644 --- a/app/views/packages.py +++ b/app/views/packages.py @@ -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 # 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" query = Package.query @@ -38,17 +46,6 @@ def doPackageList(type): 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(): return Permission.APPROVE_NEW.check(current_user) or \ Permission.APPROVE_RELEASE.check(current_user) or \ |