summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-19 22:39:30 +0000
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-19 22:39:30 +0000
commitafdee58bb7db1928f1909d1fd31d55b1af8e1616 (patch)
tree3ccd10a81cceddae9fed99598c4c9194625dc583
parent5b0031b8144ac88626fbf1d7c6b5be9b4e662e29 (diff)
downloadChimère-afdee58bb7db1928f1909d1fd31d55b1af8e1616.tar.bz2
Chimère-afdee58bb7db1928f1909d1fd31d55b1af8e1616.zip
Fix urls for production
-rw-r--r--chimere/admin.py2
-rw-r--r--chimere/templates/chimere/no_map.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 67e0e51..80448f3 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -249,7 +249,7 @@ class MarkerAdmin(admin.ModelAdmin):
return managed_modified(self, request,
Marker.objects.filter(pk=item_id))
def get_urls(self):
- from django.conf.urls.defaults import *
+ from django.conf.urls.defaults import patterns, url
urls = super(MarkerAdmin, self).get_urls()
my_urls = patterns('',
url(r'^admin_modification/(?P<item_id>\d+)/$',
diff --git a/chimere/templates/chimere/no_map.html b/chimere/templates/chimere/no_map.html
index c707a0b..a078e5e 100644
--- a/chimere/templates/chimere/no_map.html
+++ b/chimere/templates/chimere/no_map.html
@@ -1,5 +1,6 @@
{% extends "chimere/base.html" %}
{% load i18n unlocalize_point chimere_tags %}
+{% load url from future %}
{% block extra_head %}
{% head_jquery %}
{% head_chimere %}