[tor-commits] [pups/master] fixed an error introduced in 906a2ed4b4cb56adf4c785413d00dc0fa6279a58

[colin@xxxxxxxxxxxxxx]

commit a83c6e321da5c58b66716cb1b9060a88b1b09ee2
Author: Sherief Alaa <sheriefalaa.w@xxxxxxxxx>
Date:   Wed May 14 15:22:58 2014 +0200

    fixed an error introduced in 906a2ed4b4cb56adf4c785413d00dc0fa6279a58
---
 pups/settings.py.sample       |    6 +++---
 webchat/templates/tokens.html |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pups/settings.py.sample b/pups/settings.py.sample
index 8f35996..97d4ab6 100644
--- a/pups/settings.py.sample
+++ b/pups/settings.py.sample
@@ -2,8 +2,8 @@
 import os
 PROJECT_PATH = os.path.dirname(os.path.realpath(__file__))
 
-DEBUG = True
-#DEBUG = False
+#DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
@@ -113,7 +113,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 
 # pups custom configuration
 CONFIG = {
-    'url':  'support.example.com'  # URL that will be displayed in /token
+    'url':  'support.example.com',  # URL that will be displayed in /token
     'server': '',  # xmpp server
     'bosh': '',  # http://example.com/http-bind
     'receiver': '',  # @example.lit
diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html
index 8cc7976..ed95254 100644
--- a/webchat/templates/tokens.html
+++ b/webchat/templates/tokens.html
@@ -40,7 +40,7 @@
  {% for token in tokens %}
     <tr>
       <td><input name="selected_list" type="checkbox" value="{{token.token}}"></td>
-      <td>http://{{server}}/chat/{{token.token}}</td> <!-- Should be replaced with https and the correct domain -->
+      <td>http://{{url}}/chat/{{token.token}}</td> <!-- Should be replaced with https and the correct domain -->
       <td>{{token.expires_at|date:"Y-m-d G:i"}}</td>
       <td>{{token.comment}}</td>
     </tr>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits