From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 13 Apr 2011 22:32:02 +0000 (+0000)
Subject: removing the smart_str function from the html.objelink function argument, it causes... 
X-Git-Tag: live~333
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/c354e3166e70df3c9384185590f23a61616310b3

removing the smart_str function from the html.objelink function argument, it causes trouble as this argument is also used to call the get_absolute_url property

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@980 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/notifications/answeraccepted.html b/forum/skins/default/templates/notifications/answeraccepted.html
index 6d9c041..4ce25a7 100644
--- a/forum/skins/default/templates/notifications/answeraccepted.html
+++ b/forum/skins/default/templates/notifications/answeraccepted.html
@@ -6,9 +6,9 @@
     question = smart_str(answer.question)
     question_title = html.mark_safe(smart_str(question.title))
     accepted_by = html.mark_safe(smart_str(answer.nstate.accepted.by.username))
-    accepted_by_link = html.objlink(smart_str(answer.nstate.accepted.by), style=settings.EMAIL_ANCHOR_STYLE)
-    answer_author_link = html.objlink(smart_str(answer.author), style=settings.EMAIL_ANCHOR_STYLE)
-    question_link = html.objlink(smart_str(question), style=settings.EMAIL_ANCHOR_STYLE)
+    accepted_by_link = html.objlink(answer.nstate.accepted.by, style=settings.EMAIL_ANCHOR_STYLE)
+    answer_author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
diff --git a/forum/skins/default/templates/notifications/newanswer.html b/forum/skins/default/templates/notifications/newanswer.html
index 5936d52..1f3140c 100644
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,15 +1,15 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
-    prefix = smart_str(html.mark_safe(settings.EMAIL_SUBJECT_PREFIX))
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
     app_name = smart_str(settings.APP_SHORT_NAME)
-    safe_app_name = smart_str(html.mark_safe(settings.APP_SHORT_NAME))
-    answer_author = smart_str(html.mark_safe(answer.author.username))
-    question = smart_str(answer.question)
-    question_title = smart_str(html.mark_safe(question.title))
-    safe_body = smart_str(html.html2text(answer.html))
-    author_link = smart_str(html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE))
-    question_link = smart_str(html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE))
+    safe_app_name = html.mark_safe(smart_str(settings.APP_SHORT_NAME))
+    answer_author = html.mark_safe(smart_str(answer.author.username))
+    question = answer.question
+    question_title = html.mark_safe(smart_str(question.title))
+    safe_body = html.html2text(smart_str(answer.html))
+    author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
diff --git a/forum/skins/default/templates/notifications/newcomment.html b/forum/skins/default/templates/notifications/newcomment.html
index d629f64..b72b867 100644
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -9,8 +9,8 @@
     comment_author = html.mark_safe(smart_str(comment.author))
     question_title = html.mark_safe(smart_str(question.title))
     safe_body = html.html2text(smart_str(comment.comment))
-    author_link = html.objlink(smart_str(comment.author), style=settings.EMAIL_ANCHOR_STYLE)
-    question_link = html.objlink(smart_str(question), style=settings.EMAIL_ANCHOR_STYLE)
+    author_link = html.objlink(comment.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
diff --git a/forum/skins/default/templates/notifications/newmember.html b/forum/skins/default/templates/notifications/newmember.html
index 5de2f29..aa5d5ec 100644
--- a/forum/skins/default/templates/notifications/newmember.html
+++ b/forum/skins/default/templates/notifications/newmember.html
@@ -8,7 +8,7 @@
     newmember_name = smart_str(newmember.username)
     safe_newmember_name = html.mark_safe(smart_str(newmember.username))
     newmember_url = smart_str(newmember.get_profile_url())
-    newmember_link = html.objlink(smart_str(newmember), style=settings.EMAIL_ANCHOR_STYLE)
+    newmember_link = html.objlink(newmember, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
diff --git a/forum/skins/default/templates/notifications/newquestion.html b/forum/skins/default/templates/notifications/newquestion.html
index ae41017..1f48a38 100644
--- a/forum/skins/default/templates/notifications/newquestion.html
+++ b/forum/skins/default/templates/notifications/newquestion.html
@@ -9,8 +9,8 @@
     question_title = html.mark_safe(smart_str(question.title))
     question_tags = html.mark_safe(smart_str(question.tagnames))
     safe_body = html.html2text(smart_str(question.html))
-    author_link = html.objlink(smart_str(question.author), style=settings.EMAIL_ANCHOR_STYLE)
-    question_link = html.objlink(smart_str(question), style=settings.EMAIL_ANCHOR_STYLE)
+    author_link = html.objlink(question.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
     tag_links = html.mark_safe(smart_str(" ".join([html.objlink(t, style=settings.EMAIL_ANCHOR_STYLE) for t in question.tags.all()])))
 {% enddeclare %}