##// END OF EJS Templates
vcs: Return merge reference in merge response....
vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

File last commit:

r518:9f9ffd3a default
r1051:668a5e47 default
Show More
sequence.pt
23 lines | 698 B | text/plain | TextLexer
<div tal:define="
item_tmpl item_template|field.widget.readonly_item_template;
oid oid|field.oid;
name name|field.name;
title title|field.title;"
class="deform-seq"
id="${oid}">
<div class="panel panel-default">
<div class="panel-heading">${title}</div>
<div class="panel-body">
<div class="deform-seq-container">
<div tal:define="subfields [ x[1] for x in subfields ]"
tal:repeat="subfield subfields"
tal:replace="structure subfield.render_template(item_tmpl,
parent=field)" />
</div>
<div style="clear: both"></div>
</div>
</div>
</div>