diff options
Diffstat (limited to 'app/views/packages')
| -rw-r--r-- | app/views/packages/__init__.py | 8 | ||||
| -rw-r--r-- | app/views/packages/todo.py | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py index 6ef76ec..4d357a6 100644 --- a/app/views/packages/__init__.py +++ b/app/views/packages/__init__.py @@ -100,11 +100,11 @@ def package_page(package): package.checkPerm(current_user, Permission.APPROVE_NEW) similar_topics = None if not show_similar_topics else \ - KrockForumTopic.query \ + ForumTopic.query \ .filter_by(name=package.name) \ - .filter(KrockForumTopic.topic_id != package.forums) \ - .filter(~ db.exists().where(Package.forums==KrockForumTopic.topic_id)) \ - .order_by(db.asc(KrockForumTopic.name), db.asc(KrockForumTopic.title)) \ + .filter(ForumTopic.topic_id != package.forums) \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ .all() releases = getReleases(package) diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py index 81735eb..84cfef4 100644 --- a/app/views/packages/todo.py +++ b/app/views/packages/todo.py @@ -41,8 +41,8 @@ def todo_page(): screenshots = PackageScreenshot.query.filter_by(approved=False).all() - topics_to_add = KrockForumTopic.query \ - .filter(~ db.exists().where(Package.forums==KrockForumTopic.topic_id)) \ + topics_to_add = ForumTopic.query \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ .count() return render_template("todo/list.html", title="Reports and Work Queue", @@ -54,11 +54,11 @@ def todo_page(): @app.route("/todo/topics/") @login_required def todo_topics_page(): - total = KrockForumTopic.query.count() + total = ForumTopic.query.count() - topics = KrockForumTopic.query \ - .filter(~ db.exists().where(Package.forums==KrockForumTopic.topic_id)) \ - .order_by(db.asc(KrockForumTopic.name), db.asc(KrockForumTopic.title)) \ + topics = ForumTopic.query \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ .all() return render_template("todo/topics.html", topics=topics, total=total) |