#OSQA-388, creating a separate action for the award points for an answer functionality.

[osqa.git] / forum / registry.py

diff --git a/forum/registry.py b/forum/registry.py
index 95aea18da0b21e9353016ae9b59be50578608c01..aedf5b0d1b0e1dbcc4d773ff8a4d4c3a021cfb87 100644 (file)
--- a/forum/registry.py
+++ b/forum/registry.py
@@ -1,11 +1,19 @@
-from forum.modules import ui
+from forum.modules import ui, get_modules_script

 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify

+from django.template import get_templatetags_modules

 from forum.templatetags.extra_tags import get_score_badge
 from forum.templatetags.extra_tags import get_score_badge

+from forum.utils.html import cleanup_urls

 from forum import settings
 
 
 from forum import settings
 
 

+modules_template_tags = get_modules_script('templatetags')
+django_template_tags = get_templatetags_modules()
+
+for m in modules_template_tags:
+    django_template_tags.append(m.__name__)
+

 ui.register(ui.HEADER_LINKS,
             ui.Link(_('faq'), ui.Url('faq'), weight=400),
             ui.Link(_('about'), ui.Url('about'), weight=300),
 ui.register(ui.HEADER_LINKS,
             ui.Link(_('faq'), ui.Url('faq'), weight=400),
             ui.Link(_('about'), ui.Url('about'), weight=300),


@@ -38,7 +46,7 @@ class SupportLink(ui.Link):
 ui.register(ui.FOOTER_LINKS,
             ui.Link(
                     text=_('contact'),
 ui.register(ui.FOOTER_LINKS,
             ui.Link(
                     text=_('contact'),

-                    url=lambda u, c: settings.CONTACT_URL and settings.CONTACT_URL or "%s?next=%s" % (reverse('feedback'), c['request'].path),
+                    url=lambda u, c: settings.CONTACT_URL and settings.CONTACT_URL or "%s?next=%s" % (reverse('feedback'), cleanup_urls( c['request'].path)),

                     weight=400),
             SupportLink(_('support'), settings.SUPPORT_URL, attrs={'target': '_blank'}, weight=300),
             ui.Link(_('privacy'), ui.Url('privacy'), weight=200),
                     weight=400),
             SupportLink(_('support'), settings.SUPPORT_URL, attrs={'target': '_blank'}, weight=300),
             ui.Link(_('privacy'), ui.Url('privacy'), weight=200),