diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-14 15:08:49 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-14 15:08:49 -0500 |
| commit | 7949d88a751e52a2e0aef42e4801e17283556467 (patch) | |
| tree | d76df995d33b18acdaea87942f37e40ea3dc6f93 /mediagoblin/templates | |
| parent | 135dd5296b16a8612a787e8beca28ea805e32583 (diff) | |
| download | mediagoblin-7949d88a751e52a2e0aef42e4801e17283556467.tar.lz mediagoblin-7949d88a751e52a2e0aef42e4801e17283556467.tar.xz mediagoblin-7949d88a751e52a2e0aef42e4801e17283556467.zip | |
Avoiding the celery warnings that we seem to be confusing people lately.
Basically, it's shuffling around the notifications stuff.
This commit sponsored by Günter Kraft. Thank you!
Diffstat (limited to 'mediagoblin/templates')
3 files changed, 5 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index bbc77351..65dbebc0 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -60,10 +60,10 @@ {%- if request.user %} {% if request.user and request.user.status == 'active' %} - {% set notification_count = request.notifications.get_notification_count(request.user.id) %} + {% set notification_count = get_notification_count(request.user.id) %} {% if notification_count %} - <a href="#notifications" class="notification-gem button_action" title="Notifications"> - {{ notification_count }}</a> + <a href="#notifications" class="notification-gem button_action" title="Notifications"> + {{ notification_count }}</a> {% endif %} <a href="#header" class="button_action header_dropdown_down">▼</a> <a href="#no_header" class="button_action header_dropdown_up">▲</a> diff --git a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html index 613100aa..70d7935a 100644 --- a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html +++ b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html @@ -1,4 +1,4 @@ -{% set notifications = request.notifications.get_notifications(request.user.id) %} +{% set notifications = get_notifications(request.user.id) %} {% if notifications %} <div class="header_notifications"> <h3>{% trans %}New comments{% endtrans %}</h3> diff --git a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html index bd367e80..75da5e89 100644 --- a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html +++ b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html @@ -16,8 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #} {%- if request.user %} - {% set subscription = request.notifications.get_comment_subscription( - request.user.id, media.id) %} + {% set subscription = get_comment_subscription(request.user.id, media.id) %} {% if not subscription or not subscription.notify %} <a type="submit" href="{{ request.urlgen('mediagoblin.notifications.subscribe_comments', user=media.get_uploader.username, |