added conditional SSE_ENDPOINT

BotBotMe · Jan 22, 2015 · 16223ad · 16223ad
1 parent d282b2c
commit 16223ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/botbot/templates/logs/logs.html b/botbot/templates/logs/logs.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-<<<<<<< HEAD
 {% load channel_url assets logs_tags %}
 
 

diff --git a/botbot/urls/base.py b/botbot/urls/base.py
@@ -40,7 +40,8 @@
     url(r'^request/success/$', 'django.shortcuts.render',
         {'template_name': 'bots/request_success.html'}, name='request_channel_success'),
     url(r'^map/$', 'django.shortcuts.render',
-        {'template_name': 'map.html'}, name='realtime_map'),
+        {'template_name': 'map.html', 'dictionary': {'source': settings.SSE_ENDPOINT}} ,
+        name='realtime_map'),
 
     (r'^settings/', include('botbot.apps.accounts.urls')),
     url(r'^_suggest_users/$', SuggestUsers.as_view(), name='suggest_users'),