diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-10 15:12:04 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-10 15:48:35 -0600 |
| commit | 7658b6725d32488506f28e4867577516f2e4455f (patch) | |
| tree | 4a9cd2e28ae7446820d4954d0f72b7adadc61197 /askbot/urls.py | |
| parent | 1f90a80a86690aa70b18e8770f55afb88838a8ae (diff) | |
| download | askbot-7658b6725d32488506f28e4867577516f2e4455f.tar.gz askbot-7658b6725d32488506f28e4867577516f2e4455f.tar.bz2 askbot-7658b6725d32488506f28e4867577516f2e4455f.zip | |
Fixed issue with feed, changed settings.py template, fixed issue with
skin loader, fixed urls.py for feeds
fixed bug in messages hack with django 1.4.1
all test pass in 1.3.1, haystack and email parsing tests fails on 1.4.1
Diffstat (limited to 'askbot/urls.py')
| -rw-r--r-- | askbot/urls.py | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/askbot/urls.py b/askbot/urls.py index 1d11e3e8..4694b38c 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -219,6 +219,11 @@ urlpatterns = patterns('', views.meta.list_suggested_tags, name = 'list_suggested_tags' ), + + #feeds + url(r'^feeds/rss/$', RssLastestQuestionsFeed(), name="latest_questions_feed"), + url(r'^feeds/question/(?P<pk>\d+)/$', RssIndividualQuestionFeed(), name="individual_question_feed"), + url(#ajax only r'^%s$' % 'moderate-suggested-tag', views.commands.moderate_suggested_tag, @@ -552,18 +557,3 @@ if 'avatar' in settings.INSTALLED_APPS: name='avatar_render_primary' ), ) - -if django.get_version() <= '1.3.1': - urlpatterns += ( - url( - r'^feeds/(?P<url>.*)/$', - 'django.contrib.syndication.views.feed', - {'feed_dict': feeds}, - name='feeds' - ), - ) -else: - urlpatterns += ( - url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"), - url(r'^feeds/question/$', RssIndividualQuestionFeed, name="individual_question_feed"), - ) |