Finish screenshot approval feature

2 files changed, 11 insertions, 2 deletions

diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py
index 4260b1c..48b50e4 100644
--- a/app/views/packages/__init__.py
+++ b/app/views/packages/__init__.py
@@ -195,6 +195,10 @@ def approve_package_page(package):
 	else:
 		package.approved = True
 
+		screenshots = PackageScreenshot.query.filter_by(package=package, approved=False).all()
+		for s in screenshots:
+			screenshots.approved = True
+
 		triggerNotif(package.author, current_user,
 				"{} approved".format(package.title), package.getDetailsURL())
 		db.session.commit()
diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py
index 63f843b..2635604 100644
--- a/app/views/packages/todo.py
+++ b/app/views/packages/todo.py
@@ -26,6 +26,7 @@ from app.models import *
 def todo_page():
 	canApproveNew = Permission.APPROVE_NEW.check(current_user)
 	canApproveRel = Permission.APPROVE_RELEASE.check(current_user)
+	canApproveScn = Permission.APPROVE_SCREENSHOT.check(current_user)
 
 	packages = None
 	if canApproveNew:
@@ -35,6 +36,10 @@ def todo_page():
 	if canApproveRel:
 		releases = PackageRelease.query.filter_by(approved=False).all()
 
+	screenshots = None
+	if canApproveScn:
+		screenshots = PackageScreenshot.query.filter_by(approved=False).all()
+
 	return render_template("todo.html", title="Reports and Work Queue",
-		approve_new=packages, releases=releases,
-		canApproveNew=canApproveNew, canApproveRel=canApproveRel)
+		packages=packages, releases=releases, screenshots=screenshots,
+		canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn)