##// 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:

r2558:572d9909 default
r2784:e8c62649 default
Show More
textinput.pt
29 lines | 1.0 KiB | text/plain | TextLexer
<span tal:define="name name|field.name;
css_class css_class|field.widget.css_class;
oid oid|field.oid;
mask mask|field.widget.mask;
placeholder placeholder|field.widget.placeholder|field.placeholder|'';
mask_placeholder mask_placeholder|field.widget.mask_placeholder;
style style|field.widget.style;
help_block help_block|field.widget.help_block|'';
"
tal:omit-tag="">
<input type="text" name="${name}" value="${cstruct}"
id="${oid}"
placeholder="${placeholder}"
tal:attributes="class string: form-control ${css_class or ''};
style style"
/>
<p tal:condition="help_block" class="help-block">${help_block}</p>
<script tal:condition="mask" type="text/javascript">
deform.addCallback(
'${oid}',
function (oid) {
$("#" + oid).mask("${mask}",
{placeholder:"${mask_placeholder}"});
});
</script>
</span>