popover unicode fix

jhpyle · Feb 8, 2017 · 3772320 · 3772320
1 parent c38eec7
commit 3772320
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docassemble_base/docassemble/base/filter.py b/docassemble_base/docassemble/base/filter.py
@@ -939,7 +939,8 @@ def my_escape(result):
     return(result)
 
 def noquote(string):
-    return json.dumps(string.replace('\n', ' ').rstrip())
+    #return json.dumps(string.replace('\n', ' ').rstrip())
+    return '"' + string.replace('\n', ' ').replace('"', '&quot;').rstrip() + '"'
 
 def add_terms(termname, terms):
     #logmessage("add terms with " + termname + "\n")

diff --git a/docassemble_base/docassemble/base/standardformatter.py b/docassemble_base/docassemble/base/standardformatter.py
@@ -622,7 +622,7 @@ def as_html(status, url_for, debug, root, validation_rules):
                     if field.datatype == 'object_checkboxes':
                         datatypes[safeid(from_safeid(field.saveas) + ".gathered")] = 'boolean'
             if field.number in status.helptexts:
-                helptext_start = '<a class="daterm" data-container="body" data-toggle="popover" data-placement="bottom" data-content=' + noquote(unicode(status.helptexts[field.number])) + '>' 
+                helptext_start = '<a class="daterm" data-container="body" data-toggle="popover" data-placement="bottom" data-content=' + noquote(status.helptexts[field.number]) + '>' 
                 helptext_end = '</a>'
             else:
                 helptext_start = ''