Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
erp5
Commits
8da0313f
Commit
8da0313f
authored
Jul 03, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_hal_json_style: undo spaces and newlines changes
parent
ec4b1276
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+7
-6
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
8da0313f
...
...
@@ -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>
"""
from
ZTUtils
import
make_query
import
json
from
base64
import
urlsafe_b64encode
,
urlsafe_b64decode
...
...
@@ -79,6 +78,7 @@ else:
if
response
is
None
:
response
=
REQUEST
.
RESPONSE
def
isFieldType
(
field
,
type_name
):
if
field
.
meta_type
==
'ProxyField'
:
field
=
field
.
getRecursiveTemplateField
()
...
...
@@ -966,6 +966,7 @@ def renderForm(traversed_document, form, response_dict, key_prefix=None, selecti
view
=
'view'
)
}
use_relation_form_page_template
=
(
form
.
pt
==
"relation_form"
)
if
use_relation_form_page_template
:
# Provide the list of possible listboxes
...
...
@@ -1159,6 +1160,7 @@ def renderFormDefinition(form, response_dict):
for
field
in
form
.
get_fields_in_group
(
group
[
'goid'
],
include_disabled
=
1
):
field_list
.
append
((
field
.
id
,
{
'meta_type'
:
field
.
meta_type
}))
group_list
.
append
((
group
[
'gid'
],
field_list
))
# 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,
for
k
,
v
in
byteify
(
extra_param_json
.
items
()):
REQUEST
.
set
(
k
,
v
)
# Add a link to the portal type if possible
if
not
is_portal
:
# 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,
# XXX Custom slapos code
##############
if
is_site_root
:
result_dict
[
'default_view'
]
=
'view'
REQUEST
.
set
(
"X-HATEOAS-CACHE"
,
1
)
...
...
@@ -1541,7 +1542,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
'method'
:
'POST'
,
'name'
:
'Bulk'
}
# Handle also other kind of users: instance, computer, master
person
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserValue
()
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,
"relative_url"
:
person
.
getRelativeUrl
(),
"script_id"
:
script
.
id
},
#
'_relative_url': person.getRelativeUrl()
#
'_relative_url': person.getRelativeUrl()
}
else
:
traversed_document_portal_type
=
traversed_document
.
getPortalType
()
if
traversed_document_portal_type
in
(
"ERP5 Form"
,
"ERP5 Report"
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment