Commit: e6846e54f1f663efcaada498bfc2db5b2aab3260 - allura (git)

allura

Commit MetaInfo

• Révision: e6846e54f1f663efcaada498bfc2db5b2aab3260 (tree)
• l'heure: 2012-05-11 06:32:05
• Auteur: Rick Copeland <rick@arbo...>
• Commiter: Jenny Steele

Message de Log

[#3940] Make forum markdown description display on forum index page

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• modified: ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_forum.py

Modification

--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -35,7 +35,7 @@
       <tr>
         <td>
           <strong><a href="{{forum.url()}}">{{forum.name}}</a></strong><br>
-          {{forum.description}}
+          {{g.markdown.convert(forum.description)}}
           {% if forum.deleted %}
             <div class="notice">This forum has been deleted and is not visible to non-admin users</div>
           {% endif %}

--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -272,6 +272,15 @@ class TestForum(TestController):
         r = self.app.get('/admin/discussion/forums')
         assert u'téstforum'.encode('utf-8') in r
 
+    def test_markdown_description(self):
+        r = self.app.get('/admin/discussion/forums')
+        r.forms[1]['add_forum.shortname'] = 'tester'
+        r.forms[1]['add_forum.name'] = 'Tester'
+        r.forms[1]['add_forum.description'] = '<a href="http://cnn.com">This is CNN</a>'
+        r.forms[1].submit()
+        r = self.app.get('/discussion/')
+        assert_equal(len(r.html.findAll('a', rel='nofollow')), 1)
+
     def test_forum_search(self):
         r = self.app.get('/discussion/search')
         r = self.app.get('/discussion/search', params=dict(q='foo'))