jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix two opening form tags (#2972)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-29 15:49:54 +01:00
committed by GitHub
parent 0464054a2b
commit d994339de5
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/macros/search.html.twig
View File

@@ -14,7 +14,7 @@
{% set orderHasError = form.orderBy.vars.errors|length > 0 or form.order.vars.errors|length > 0 %} {% set orderHasError = form.orderBy.vars.errors|length > 0 or form.order.vars.errors|length > 0 %}
{% set orderBy = form_widget(form.orderBy) %} {% set orderBy = form_widget(form.orderBy) %}
{% set order = form_widget(form.order) %} {% set order = form_widget(form.order) %}
{{ form(form) }} {{ form_rest(form) }}
<div class="form-group{% if orderHasError %} has-error{% endif %}"> <div class="form-group{% if orderHasError %} has-error{% endif %}">
{{ form_label(form.orderBy) }} {{ form_label(form.orderBy) }}
<div class="col-sm-5 col-xs-5"> <div class="col-sm-5 col-xs-5">

2
templates/macros/toolbar.html.twig
View File

@@ -23,7 +23,7 @@
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
{{ form(form) }} {{ form_rest(form) }}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary pull-left" data-type="submit">{{ 'search'|trans }}</button> <button type="submit" class="btn btn-primary pull-left" data-type="submit">{{ 'search'|trans }}</button>

20
templates/quick-entry/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %} {% extends 'base.html.twig' %}
{% import "quick-entry/actions.html.twig" as actions %} {% import "quick-entry/actions.html.twig" as actions %}
{% block page_title %}{{ 'quick_entry.title'|trans }}{% endblock %} {% block page_title %}{{ 'quick_entry.title'|trans }}{% endblock %}
@@ -8,7 +8,10 @@
{% embed '@AdminLTE/Widgets/box-widget.html.twig' %} {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_attributes %}id="quick_entry_box"{% endblock %} {% block box_attributes %}id="quick_entry_box"{% endblock %}
{% block box_before %}{{ form_start(form, {attr: {class: 'form-dataTable'}}) }}{% endblock %} {% block box_before %}
{{ form_start(form, {attr: {class: 'form-dataTable'}}) }}
{{ form_widget(form._token) }}
{% endblock %}
{% block box_after %}{{ form_end(form) }}{% endblock %} {% block box_after %}{{ form_end(form) }}{% endblock %}
{% block box_title %} {% block box_title %}
{{ form_widget(form.date) }} {{ form_widget(form.date) }}
@@ -36,7 +39,7 @@
</tr> </tr>
</thead> </thead>
<tbody id="ts-collection" data-index="{{ form.rows.children|length }}"> <tbody id="ts-collection" data-index="{{ form.rows.children|length }}">
{{ form(form) }} {{ form_widget(form.rows) }}
</tbody> </tbody>
<tfoot> <tfoot>
<tr class="summary"> <tr class="summary">
@@ -103,14 +106,20 @@
const collectionHolder = document.getElementById(e.currentTarget.dataset.collectionHolder); const collectionHolder = document.getElementById(e.currentTarget.dataset.collectionHolder);
const collectionPrototype = document.getElementById(e.currentTarget.dataset.collectionPrototype); const collectionPrototype = document.getElementById(e.currentTarget.dataset.collectionPrototype);
const node = document.createElement('tr'); const fakeNode = document.createElement('table');
node.innerHTML = collectionPrototype fakeNode.innerHTML = collectionPrototype
.dataset .dataset
.prototype .prototype
.replace( .replace(
/__name__/g, /__name__/g,
collectionHolder.dataset.index collectionHolder.dataset.index
); );
let node = fakeNode.children[0];
if (node.nodeName.toUpperCase() === 'TBODY') {
node = node.children[0];
}
collectionHolder.appendChild(node); collectionHolder.appendChild(node);
jQuery(node).find('.selectpicker').each(function(i, el) { jQuery(node).find('.selectpicker').each(function(i, el) {
@@ -118,6 +127,7 @@
}); });
collectionHolder.dataset.index++; collectionHolder.dataset.index++;
recalculateTotals();
}; };
document.querySelectorAll('.add-item-link').forEach(btn => btn.addEventListener("click", addFormToCollection)); document.querySelectorAll('.add-item-link').forEach(btn => btn.addEventListener("click", addFormToCollection));