Commit 8da0313f authored by Roque's avatar Roque

erp5_hal_json_style: undo spaces and newlines changes

parent ec4b1276
...@@ -47,7 +47,6 @@ When handling form, we can expect field values to be stored in REQUEST.form in t ...@@ -47,7 +47,6 @@ When handling form, we can expect field values to be stored in REQUEST.form in t
- python-object parsed from raw values under <field.id> - python-object parsed from raw values under <field.id>
""" """
from ZTUtils import make_query from ZTUtils import make_query
import json import json
from base64 import urlsafe_b64encode, urlsafe_b64decode from base64 import urlsafe_b64encode, urlsafe_b64decode
...@@ -79,6 +78,7 @@ else: ...@@ -79,6 +78,7 @@ else:
if response is None: if response is None:
response = REQUEST.RESPONSE response = REQUEST.RESPONSE
def isFieldType(field, type_name): def isFieldType(field, type_name):
if field.meta_type == 'ProxyField': if field.meta_type == 'ProxyField':
field = field.getRecursiveTemplateField() field = field.getRecursiveTemplateField()
...@@ -966,6 +966,7 @@ def renderForm(traversed_document, form, response_dict, key_prefix=None, selecti ...@@ -966,6 +966,7 @@ def renderForm(traversed_document, form, response_dict, key_prefix=None, selecti
view='view' view='view'
) )
} }
use_relation_form_page_template = (form.pt == "relation_form") use_relation_form_page_template = (form.pt == "relation_form")
if use_relation_form_page_template: if use_relation_form_page_template:
# Provide the list of possible listboxes # Provide the list of possible listboxes
...@@ -1159,6 +1160,7 @@ def renderFormDefinition(form, response_dict): ...@@ -1159,6 +1160,7 @@ def renderFormDefinition(form, response_dict):
for field in form.get_fields_in_group(group['goid'], include_disabled=1): for field in form.get_fields_in_group(group['goid'], include_disabled=1):
field_list.append((field.id, {'meta_type': field.meta_type})) field_list.append((field.id, {'meta_type': field.meta_type}))
group_list.append((group['gid'], field_list)) group_list.append((group['gid'], field_list))
# some forms might not have any fields so we put empty bottom group # some forms might not have any fields so we put empty bottom group
...@@ -1315,7 +1317,6 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None, ...@@ -1315,7 +1317,6 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
for k, v in byteify(extra_param_json.items()): for k, v in byteify(extra_param_json.items()):
REQUEST.set(k, v) REQUEST.set(k, v)
# Add a link to the portal type if possible # Add a link to the portal type if possible
if not is_portal: if not is_portal:
# traversed_document should always have its Portal Type in ERP5 Portal Types # traversed_document should always have its Portal Type in ERP5 Portal Types
...@@ -1497,7 +1498,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None, ...@@ -1497,7 +1498,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
# XXX Custom slapos code # XXX Custom slapos code
############## ##############
if is_site_root: if is_site_root:
result_dict['default_view'] = 'view' result_dict['default_view'] = 'view'
REQUEST.set("X-HATEOAS-CACHE", 1) REQUEST.set("X-HATEOAS-CACHE", 1)
...@@ -1541,7 +1542,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None, ...@@ -1541,7 +1542,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
'method': 'POST', 'method': 'POST',
'name': 'Bulk' 'name': 'Bulk'
} }
# Handle also other kind of users: instance, computer, master # Handle also other kind of users: instance, computer, master
person = portal.portal_membership.getAuthenticatedMember().getUserValue() person = portal.portal_membership.getAuthenticatedMember().getUserValue()
if person is not None and portal.portal_membership.checkPermission('View', person): if person is not None and portal.portal_membership.checkPermission('View', person):
...@@ -1551,9 +1552,9 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None, ...@@ -1551,9 +1552,9 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
"relative_url": person.getRelativeUrl(), "relative_url": person.getRelativeUrl(),
"script_id": script.id "script_id": script.id
}, },
#'_relative_url': person.getRelativeUrl() # '_relative_url': person.getRelativeUrl()
} }
else: else:
traversed_document_portal_type = traversed_document.getPortalType() traversed_document_portal_type = traversed_document.getPortalType()
if traversed_document_portal_type in ("ERP5 Form", "ERP5 Report"): if traversed_document_portal_type in ("ERP5 Form", "ERP5 Report"):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment