Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/loops into bbmaster

This commit is contained in:
hplattner 2016-08-11 17:01:28 +02:00
commit c64f067d6e

View file

@ -183,14 +183,17 @@
tal:attributes="value related/uidToken" /> tal:attributes="value related/uidToken" />
</td> </td>
</tr> </tr>
<tr tal:define="children python:list(related.unique(related.children())); <tal:nested condition="list_nested">
<tr tal:define="children python:
list(related.unique(related.children()));
resources python:list(related.resources())" resources python:list(related.resources())"
tal:condition="python:list_nested and (children or resources)"> tal:condition="python:children or resources">
<td tal:condition="item/showCheckboxes|nothing" /> <td tal:condition="item/showCheckboxes|nothing" />
<td colspan="5"> <td colspan="5">
<metal:list use-macro="item/template/macros/list_nested" /> <metal:list use-macro="item/template/macros/list_nested" />
</td> </td>
</tr> </tr>
</tal:nested>
</tal:item> </tal:item>
</tal:items> </tal:items>
</tbody> </tbody>