Browse Source

Fix notification digest issue

master
rubenwardy 8 months ago
parent
commit
8ad066409c
  1. 6
      app/blueprints/admin/actions.py
  2. 9
      app/templates/emails/notification_digest.html

6
app/blueprints/admin/actions.py

@ -27,6 +27,7 @@ from sqlalchemy import or_, and_ @@ -27,6 +27,7 @@ from sqlalchemy import or_, and_
from app.logic.game_support import GameSupportResolver
from app.models import PackageRelease, db, Package, PackageState, PackageScreenshot, MetaPackage, User, \
NotificationType, PackageUpdateConfig, License, UserRank, PackageType, PackageGameSupport
from app.tasks.emails import send_pending_digests
from app.tasks.forumtasks import importTopicList, checkAllForumAccounts
from app.tasks.importtasks import importRepoScreenshot, checkZipRelease, check_for_updates
from app.utils import addNotification, get_system_user
@ -330,3 +331,8 @@ def detect_game_support(): @@ -330,3 +331,8 @@ def detect_game_support():
resolver = GameSupportResolver()
resolver.update_all()
db.session.commit()
@action("Send pending notif digests")
def do_send_pending_digests():
send_pending_digests.delay()

9
app/templates/emails/notification_digest.html

@ -17,20 +17,23 @@ @@ -17,20 +17,23 @@
</ul>
{% endfor %}
{% for group in notifications | selectattr("package", "none") %}
{% set other_notifications = notifications | selectattr("package", "none") %}
{% if other_notifications %}
<h2>
{{ _("Other Notifications") }}
</h2>
<ul>
{% for notification in group %}
{% for notification in other_notifications %}
<li>
<a href="{{ notification.url | abs_url }}">{{ notification.title }}</a> -
{{ _("from %(username)s.", username=notification.causer.username) }}
</li>
{% endfor %}
</ul>
{% endfor %}
{% endif %}
<p style="margin-top: 3em;">
<a class="btn" href="{{ abs_url_for('notifications.list_all') }}">
{{ _("View Notifications") }}

Loading…
Cancel
Save