Merge 723ee6e into 1628d52

liqd · Jul 16, 2019 · 555cfa2 · 555cfa2
2 parents 1628d52 + 723ee6e
commit 555cfa2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/apps/documents/templatetags/react_documents.py b/apps/documents/templatetags/react_documents.py
@@ -15,11 +15,11 @@
 def react_documents(context, module, reload_on_success=False):
     chapters = Chapter.objects.filter(module=module)
     serializer = ChapterSerializer(chapters, many=True)
-    chapters_json = JSONRenderer().render(serializer.data)
+    chapters_json = JSONRenderer().render(serializer.data).decode("utf-8")
 
     widget = CKEditorUploadingWidget(config_name='image-editor')
     widget._set_config()
-    config = JSONRenderer().render(widget.config)
+    config = JSONRenderer().render(widget.config).decode("utf-8")
 
     context = {
         'chapters': chapters_json,

diff --git a/apps/moderatorremark/templatetags/moderatorremark_tags.py b/apps/moderatorremark/templatetags/moderatorremark_tags.py
@@ -20,14 +20,14 @@ def popover_remark(item):
 
     if remark:
         serializer = ModeratorRemarkSerializer(remark)
-        remark_json = JSONRenderer().render(serializer.data)
+        remark_json = JSONRenderer().render(serializer.data).decode("utf-8")
         context['attributes'] = remark_json
     else:
         content_type = ContentType.objects.get_for_model(item)
         empty_remark = ModeratorRemark(item_content_type=content_type,
                                        item_object_id=item.id)
         serializer = ModeratorRemarkSerializer(empty_remark)
-        remark_json = JSONRenderer().render(serializer.data)
+        remark_json = JSONRenderer().render(serializer.data).decode("utf-8")
         context['attributes'] = remark_json
 
     return context
diff --git a/apps/polls/templatetags/react_polls.py b/apps/polls/templatetags/react_polls.py
@@ -18,14 +18,16 @@ def react_polls(context, question):
 
     return format_html(
         '<div data-mb-widget="polls" data-question="{question}"></div>',
-        question=JSONRenderer().render(question_serializer.data)
+        question=JSONRenderer()
+        .render(question_serializer.data)
+        .decode("utf-8")
     )
 
 
 @register.simple_tag
 def react_poll_form(poll, reload_on_success=False):
     serializer = serializers.PollSerializer(poll)
-    data_poll = JSONRenderer().render(serializer.data)
+    data_poll = JSONRenderer().render(serializer.data).decode("utf-8")
     reload_on_success = json.dumps(reload_on_success)
 
     return format_html(