From dfd883a85323305e12e9e900796410067fa91240 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 02:49:29 -0400 Subject: hopefully fixed the urls in the email --- askbot/models/__init__.py | 5 +++-- askbot/skins/default/templates/instant_notification.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 8d4432aa..b78864e6 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2399,9 +2399,10 @@ def format_instant_notification_email( else: raise ValueError('unrecognized post type') - post_url = strip_path(site_url) + post.get_absolute_url(), + post_url = strip_path(site_url) + post.get_absolute_url() + user_url = strip_path(site_url) + from_user.get_absolute_url() user_action = user_action % { - 'user': from_user.username, + 'user': '%s' % (user_url, from_user.username), 'post_link': '%s' % (post_url, _(post.post_type)) } diff --git a/askbot/skins/default/templates/instant_notification.html b/askbot/skins/default/templates/instant_notification.html index e5cde3a9..cd6e5427 100644 --- a/askbot/skins/default/templates/instant_notification.html +++ b/askbot/skins/default/templates/instant_notification.html @@ -1,5 +1,5 @@ {{ reply_separator }} -
{{content_preview}}
+
{{ content_preview }}
{% trans %}

Please note - you can easily change how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!

-- cgit v1.2.3-1-g7c22