##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r1769:fb9baff8 default
r2784:e8c62649 default
Show More
sequence_item.pt
31 lines | 1.2 KiB | text/plain | TextLexer
<div tal:omit-tag="field.widget.hidden"
tal:define="hidden hidden|field.widget.hidden;
error_class error_class|field.widget.error_class;
description description|field.description;
title title|field.title;
oid oid|field.oid"
class="form-group row deform-seq-item ${field.error and error_class or ''} ${field.widget.item_css_class or ''}"
i18n:domain="deform">
<div class="deform-seq-item-group">
<span tal:replace="structure field.serialize(cstruct)"/>
<tal:errors condition="field.error and not hidden"
define="errstr 'error-%s' % oid"
repeat="msg field.error.messages()">
<p tal:condition="msg"
id="${errstr if repeat.msg.index==0 else '%s-%s' % (errstr, repeat.msg.index)}"
class="${error_class} help-block error-block"
i18n:translate="">${msg}</p>
</tal:errors>
</div>
<div class="deform-seq-item-handle" style="padding:0">
<a class="deform-close-button close"
id="${oid}-close"
tal:condition="not field.widget.hidden"
title="Remove"
i18n:attributes="title"
onclick="javascript:deform.removeSequenceItem(this);">&times;</a>
</div>
</div>