summaryrefslogtreecommitdiff
path: root/ishtar_common/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-21 23:59:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-21 23:59:27 +0100
commitb8cf790377a2ece768ea19bd1d216fdf0ee78cda (patch)
treeb72020ae9a2cee74a3060fc17495f445aa414e0e /ishtar_common/urls.py
parent456b74ac295815970483871cf2575863bc97dd6f (diff)
parent88fde9b54bd94e582fa4f8886463eda2e39ceb46 (diff)
downloadIshtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.tar.bz2
Ishtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/urls.py')
-rw-r--r--ishtar_common/urls.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 608ca3251..98bd55106 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -20,18 +20,21 @@
from django.conf import settings
from django.conf.urls.defaults import patterns, include, url
from django.conf.urls.static import static
+from django.views.generic.simple import direct_to_template
from menus import menu
from ishtar_common import views
from ishtar_common.wizards import check_rights
-# be carreful: each check_rights must be relevant with ishtar_menu
+# be careful: each check_rights must be relevant with ishtar_menu
# forms
urlpatterns = patterns(
'',
url(r'^status/$', views.status, name='status'),
+ url(r'^robots\.txt$', direct_to_template,
+ {'template': 'robots.txt', 'mimetype': 'text/plain'}),
# internationalization
url(r'^i18n/', include('django.conf.urls.i18n')),
# General