[hal_json] Ensure JSON-deserialized values are UTF8

dfd346a1 · Tomáš Peterka · Tomáš Peterka · 3a080d8b · dfd346a1
Commit dfd346a1 authored May 11, 2018 by Tomáš Peterka Committed by Tomáš Peterka May 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py ...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py +2 -2

No files found.
--- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
@@ -1383,7 +1383,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
      extra_param_json = {}

    if isinstance(extra_param_json, str):
-      extra_param_json = ensureDeserialized(json.loads(urlsafe_b64decode(extra_param_json)))
+      extra_param_json = ensureDeserialized(byteify(json.loads(urlsafe_b64decode(extra_param_json))))

    for k, v in byteify(extra_param_json.items()):
      REQUEST.set(k, v)
@@ -1696,7 +1696,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
      extra_param_json = {}

    if isinstance(extra_param_json, str):
-      extra_param_json = ensureDeserialized(json.loads(urlsafe_b64decode(extra_param_json)))
+      extra_param_json = ensureDeserialized(byteify(json.loads(urlsafe_b64decode(extra_param_json))))

    for key, value in byteify(extra_param_json.items()):
      REQUEST.set(key, value)