Skip to content

Commit ed1cbe6

Browse files
committed
Fix displaying some fields in pppw
1 parent c426d4f commit ed1cbe6

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/library/core/content/patrimoine.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,17 +421,25 @@ def is_TextTitleWidget(self, current_widget):
421421
return isinstance(current_widget, TextTitleWidget)
422422

423423
def is_there_any_fields_after_this_title(self, current_widget, lst_widgets):
424+
# DEBUG
425+
# if "Anecdotes" in current_widget.label:
426+
# import pdb; pdb.set_trace()
424427
if isinstance(lst_widgets, type(OrderedDict().values())):
425428
lst_widgets = list(lst_widgets)
426429
current_index = lst_widgets.index(current_widget)
427430
if (
428431
(current_index + 1) < len(lst_widgets)
429-
and lst_widgets[current_index + 1].value is not None
430-
and len(lst_widgets[current_index + 1].value) > 0
432+
and lst_widgets[current_index].value is not None
433+
or lst_widgets[current_index].value != ""
431434
):
432435
return True
433-
else:
436+
elif (
437+
lst_widgets[current_index + 1].value is None
438+
and lst_widgets[current_index + 1].value == ""
439+
):
434440
return False
441+
else:
442+
return True
435443

436444
def is_there_any_values(self, lst_widgets):
437445
if lst_widgets:

src/library/core/content/templates/patrimoine.pt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
tal:content="group/label" />
3737
<tal:block tal:define="values group/widgets/values" tal:repeat="widget group/widgets/values">
3838
<tal:cond tal:condition="python:view.is_TextTitleWidget(widget)">
39-
<h2 tal:condition="python:view.is_there_any_fields_after_this_title(widget, values)" tal:content="structure widget"/>
39+
<div tal:condition="python:view.is_there_any_fields_after_this_title(widget, values)" tal:content="structure widget"/>
4040
</tal:cond>
4141
<tal:cond tal:condition="python:not view.is_TextTitleWidget(widget)">
4242
<tal:widget tal:condition="widget/value" tal:replace="structure widget/@@ploneform-render-widget"/>

0 commit comments

Comments
 (0)