Move variable substitution to template so the base for edition has or…

…iginal variables not their values
reimandlab · Jun 29, 2017 · cc674fc · cc674fc
1 parent c64afcb
commit cc674fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/website/templates/text_entry.html b/website/templates/text_entry.html
@@ -8,7 +8,7 @@
       </div>
     {% endif %}
 
-    <div class="content">{{ text_entry(id) | safe }}</div>
+    <div class="content">{{ text_entry(id) | safe | substitute_allowed_variables | safe }}</div>
 
     {% if current_user.is_admin %}
       <div class="alert alert-warning feedback" role="alert"></div>

diff --git a/website/views/cms.py b/website/views/cms.py
@@ -176,7 +176,7 @@ def _text_entry(name):
             if current_user.is_admin:
                 return 'Please, click the pencil icon to add text here.'
             return ''
-        return substitute_variables(entry.content)
+        return entry.content
 
     @route('/admin/save_text_entry/', methods=['POST'])
     @admin_only