X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=236e5ca541a585d32e55c42f8f226e82a331e036;hb=86c2d35f8fa673cc0f5ce3d5930b42c95d17f06f;hp=0d0e1cce9f1e725edcd0ace8e092073268aea1fd;hpb=2a8e0a73ca07126470cca0fd845979f62693af8b;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 0d0e1cce..236e5ca5 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,7 +12,12 @@ import components
 # admin.autodiscover()
 
 # to enable insert_above stuff
-from django.template.loader import add_to_builtins
+# add_to_builtins has changed location with django-1.7
+# also note this will probably go away some day
+try:
+    from django.template.loader import add_to_builtins
+except:
+    from django.template.base import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS
@@ -83,6 +88,7 @@ urls = [
     (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
     (r'^cache/(?P<action>[^/]+)/?$', 'rest.cache.dispatch'),
     (r'^initscript/(?P<action>[^/]+)/?$', 'rest.initscript.dispatch'),
+    (r'^authority/(?P<action>[^/]+)/?$', 'rest.authority.dispatch'),
     #
     # REST monitoring
     (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
@@ -121,7 +127,7 @@ urls = [
     url(r'^portal/', include('portal.urls')),
 
     # SLA
-#    url(r'^sla/', include('sla.urls')),
+    #url(r'^sla/', include('sla.urls')),
 ]
 
 urls.extend( components.urls() )