Commit c74dc374 authored by Roque's avatar Roque

merge master

parents e1475e08 daec3c01
......@@ -1167,7 +1167,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
relative_url=None, restricted=None, list_method=None,
default_param_json=None, form_relative_url=None, extra_param_json=None):
if (restricted == 1) and (portal.portal_membership.isAnonymousUser()):
if (restricted == 1) and (portal.portal_membership.isAnonymousUser() and (response is not None)):
login_relative_url = site_root.getLayoutProperty("configuration_login", default="")
if (login_relative_url):
response.setHeader(
......
......@@ -136,7 +136,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value>
<value> <string>python: here.Movement_isQuantityEnabled()</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -82,6 +82,7 @@
sub_element.setAttribute('class', 'ui-icon-carat-r ui-btn-icon-notext');
sub_element.href = row.jump;
sub_element.textContent = ' ';
td_element.appendChild(sub_element);
tr_element.appendChild(td_element);
}
......
......@@ -90,11 +90,11 @@
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_text_content</string> </value>
<value> <string>my_view_mode_text_content</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewWebFieldLibrary</string> </value>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>height</string> </key>
......
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