diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-06-15 04:38:50 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-06-15 04:38:50 -0400 |
| commit | 97d927c5adbdfe3f610175bb879fb89e9dfb3610 (patch) | |
| tree | 1a386525550b88e096cb9c2e3e24ec8f997ef04b | |
| parent | 139f8ed96156aa755a83c7a38ba4f28a51611657 (diff) | |
| download | askbot-97d927c5adbdfe3f610175bb879fb89e9dfb3610.tar.gz askbot-97d927c5adbdfe3f610175bb879fb89e9dfb3610.tar.bz2 askbot-97d927c5adbdfe3f610175bb879fb89e9dfb3610.zip | |
added setting to settings.py ASKBOT_ADD_STACKEXCHANGE_URLS
| -rw-r--r-- | askbot/setup_templates/settings.py | 1 | ||||
| -rw-r--r-- | askbot/urls.py | 19 |
2 files changed, 14 insertions, 6 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 9a976e16..24ecb374 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -205,6 +205,7 @@ LOGIN_URL = '/%s%s%s' % (ASKBOT_URL,_('account/'),_('signin/')) #also, this url must not have the leading slash ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/') ALLOW_UNICODE_SLUGS = False +ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange #Celery Settings BROKER_BACKEND = "djkombu.transport.DatabaseTransport" diff --git a/askbot/urls.py b/askbot/urls.py index 99ff6300..873a7103 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -126,12 +126,6 @@ urlpatterns = patterns('', views.readers.get_comment, name='get_comment' ), - #place general question item in the end of other operations - url( - r'^%s(?P<id>\d+)/' % _('question/'), - views.readers.question, - name='question' - ), url( r'^%s$' % _('tags/'), views.readers.tags, @@ -253,6 +247,19 @@ urlpatterns = patterns('', ), ) +if getattr(settings, 'ASKBOT_USE_STACKEXCHANGE_URLS', False): + urlpatterns += (url( + r'^%s(?P<id>\d+)/' % _('questions/'), + views.readers.question, + name='question' + ),) +else: + urlpatterns += (url( + r'^%s(?P<id>\d+)/' % _('question/'), + views.readers.question, + name='question' + ),) + if 'askbot.deps.django_authopenid' in settings.INSTALLED_APPS: urlpatterns += ( url(r'^%s' % _('account/'), include('askbot.deps.django_authopenid.urls')), |