Fix reimport not unapproving releases

[cheatdb.git] / app / blueprints / todo / __init__.py

diff --git a/app/blueprints/todo/__init__.py b/app/blueprints/todo/__init__.py
index 89e24b88b535a8a20564714bf082b4c050a46898..682052dd88b880f0f32b82395d995063ce8873e8 100644 (file)
--- a/app/blueprints/todo/__init__.py
+++ b/app/blueprints/todo/__init__.py
@@ -64,10 +64,20 @@ def view():
                        .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
                        .count()
 
+       total_packages = Package.query.filter_by(approved=True, soft_deleted=False).count()
+       total_to_tag = Package.query.filter_by(approved=True, soft_deleted=False, tags=None).count()
+
+       unfulfilled_meta_packages = MetaPackage.query \
+                       .filter(~ MetaPackage.packages.any(approved=True, soft_deleted=False)) \
+                       .filter(MetaPackage.dependencies.any(optional=False)) \
+                       .order_by(db.asc(MetaPackage.name)).count()
+
        return render_template("todo/list.html", title="Reports and Work Queue",
                packages=packages, releases=releases, screenshots=screenshots,
                canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn,
-               topics_to_add=topics_to_add, total_topics=total_topics)
+               topics_to_add=topics_to_add, total_topics=total_topics, \
+               total_packages=total_packages, total_to_tag=total_to_tag, \
+               unfulfilled_meta_packages=unfulfilled_meta_packages)
 
 
 @bp.route("/todo/topics/")
@@ -105,7 +115,21 @@ def topics():
 @bp.route("/todo/tags/")
 @login_required
 def tags():
-       packages = Package.query.filter_by(approved=True, soft_deleted=False).all()
+       qb    = QueryBuilder(request.args)
+       qb.setSortIfNone("score", "desc")
+       query = qb.buildPackageQuery()
+
        tags = Tag.query.order_by(db.asc(Tag.title)).all()
 
-       return render_template("todo/tags.html", packages=packages, tags=tags)
+       return render_template("todo/tags.html", packages=query.all(), tags=tags)
+
+
+@bp.route("/todo/metapackages/")
+@login_required
+def metapackages():
+       mpackages = MetaPackage.query \
+                       .filter(~ MetaPackage.packages.any(approved=True, soft_deleted=False)) \
+                       .filter(MetaPackage.dependencies.any(optional=False)) \
+                       .order_by(db.asc(MetaPackage.name)).all()
+
+       return render_template("todo/metapackages.html", mpackages=mpackages)