X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=app%2Fviews%2Fpackages%2Ftodo.py;h=a29a46e24c0740c6999be359485c8226e4100654;hb=50889ccca57cea9166ab7c64a83d540d6c0a20ce;hp=84cfef4f517ebf11d0c80134f521bfef780052ff;hpb=19e1ed8b32179e3317c807b3ab0581e3b5fb00a2;p=cheatdb.git

diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py
index 84cfef4..a29a46e 100644
--- a/app/views/packages/todo.py
+++ b/app/views/packages/todo.py
@@ -17,7 +17,7 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
+import flask_menu as menu
 from app import app
 from app.models import *
 
@@ -54,11 +54,31 @@ def todo_page():
 @app.route("/todo/topics/")
 @login_required
 def todo_topics_page():
-	total = ForumTopic.query.count()
+	query = ForumTopic.query
 
-	topics = ForumTopic.query \
-			.filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
-			.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
-			.all()
+	show_discarded = request.args.get("show_discarded") == "True"
+	if not show_discarded:
+		query = query.filter_by(discarded=False)
+
+	total = query.count()
+
+	query = query.filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
+		.order_by(db.asc(ForumTopic.wip), db.asc(ForumTopic.name), db.asc(ForumTopic.title))
+
+	topic_count = query.count()
+
+	search = request.args.get("q")
+	if search is not None and search.strip() != "":
+		query = query.filter(ForumTopic.title.ilike('%' + search + '%'))
+
+	page  = int(request.args.get("page") or 1)
+	num   = min(100, int(request.args.get("n") or 100))
+	query = query.paginate(page, num, True)
+	next_url = url_for("todo_topics_page", page=query.next_num) \
+			if query.has_next else None
+	prev_url = url_for("todo_topics_page", page=query.prev_num) \
+			if query.has_prev else None
 
-	return render_template("todo/topics.html", topics=topics, total=total)
+	return render_template("todo/topics.html", topics=query.items, total=total, \
+			topic_count=topic_count, query=search, show_discarded=show_discarded, \
+			next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages)