Skip to content

fix/restore form opening so cancel button works properly #21717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: 11.0/bugfixes
Choose a base branch
from
+46 −39
Open

fix/restore form opening so cancel button works properly #21717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57a77d2
restore form opening so cancel button works properly
Herafia Oct 30, 2025
6cfaea6
tests
Herafia Oct 30, 2025
b9e3b00
tests
Herafia Oct 31, 2025
3a1e94e
modif layout
Herafia Nov 4, 2025
d68f7a8
Update templates/components/itilobject/layout.html.twig
Herafia Nov 4, 2025
a16ebe5
fix type button
Herafia Nov 12, 2025
8026c30
form
Herafia Nov 12, 2025
77d0314
modify test and layout
Herafia Nov 12, 2025
8883a10
test 1 or 0 form // simplify layout
Herafia Nov 12, 2025
2cdb0f2
Apply suggestions from code review
cedric-anne Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions templates/components/itilobject/footer.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
class="btn btn-primary answer-action {{ default_action != "answer" ? "action-" ~ default_action : "" }}"
data-bs-toggle="collapse"
data-bs-target="#new-{{ default_action_data.class }}-block"
type="button"
>
<i class="{{ default_action_data.icon }}"></i>
<span>{{ default_action_data.label }}</span>
Expand Down
84 changes: 45 additions & 39 deletions templates/components/itilobject/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,39 +58,43 @@

<div id="itil-object-container" class="mt-n1 {{ collapsed_cls }} {{ expanded_cls }}">

{% if item.isNewItem() and not template_preview %}
{{ include('components/itilobject/mainform_open.html.twig') }}
{% endif %}

<div class="row d-flex flex-column itil-object">
{% set is_timeline_reversed = user_pref('timeline_order') == constant('CommonITILObject::TIMELINE_ORDER_REVERSE') %}
{% set fl_direction = (item.isNewItem() or is_timeline_reversed ? 'flex-column' : 'flex-column-reverse') %}
<div class="itil-left-side col-12 {{ left_side_cls }} order-last order-lg-first pt-2 pe-2 pe-lg-4 d-flex {{ fl_direction }} border-top border-4 {{ not show_extra_fields ? "w-100" : "" }}">
{% if item.isNewItem() %}
{{ include('components/itilobject/timeline/new_form.html.twig') }}
{% else %}
{{ include('components/itilobject/timeline/timeline.html.twig') }}
{% endif %}
</div>
{% if show_extra_fields %}
<div class="itil-right-side col-12 {{ right_side_cls }} mt-0 mt-lg-n1 card-footer p-0 rounded-0">
{% if not item.isNewItem() %}
{{ include('components/itilobject/mainform_open.html.twig') }}
{# Main form opening for new item #}
{% if item.isNewItem() and not template_preview %}
{{ include('components/itilobject/mainform_open.html.twig') }}
{% endif %}

<div class="row d-flex flex-column itil-object">
{% set is_timeline_reversed = user_pref('timeline_order') == constant('CommonITILObject::TIMELINE_ORDER_REVERSE') %}
{% set fl_direction = (item.isNewItem() or is_timeline_reversed ? 'flex-column' : 'flex-column-reverse') %}
<div class="itil-left-side col-12 {{ left_side_cls }} order-last order-lg-first pt-2 pe-2 pe-lg-4 d-flex {{ fl_direction }} border-top border-4 {{ not show_extra_fields ? "w-100" : "" }}">
{% if item.isNewItem() %}
{{ include('components/itilobject/timeline/new_form.html.twig') }}
{% else %}
{{ include('components/itilobject/timeline/timeline.html.twig') }}
{% endif %}
{{ include('components/itilobject/fields_panel.html.twig') }}
{% if not item.isNewItem() %}
{{ include('components/itilobject/mainform_close.html.twig') }}
{% endif %}
</div>
{% endif %}
</div>

{% if not template_preview %}
{{ include('components/itilobject/footer.html.twig') }}
{% if not item.isNewItem() %}
{{ include('components/itilobject/mainform_close.html.twig') }}
{% endif %}
{% endif %}
</div>
{% if show_extra_fields %}
<div class="itil-right-side col-12 {{ right_side_cls }} mt-0 mt-lg-n1 card-footer p-0 rounded-0">
{% if not item.isNewItem() %}
{{ include('components/itilobject/mainform_open.html.twig') }}
{% endif %}
{{ include('components/itilobject/fields_panel.html.twig') }}
{% if not item.isNewItem() %}
{{ include('components/itilobject/mainform_close.html.twig') }}
{% endif %}
</div>
{% endif %}
</div>

{% if not template_preview %}
{{ include('components/itilobject/footer.html.twig') }}
{% endif %}

{# Main form closing for new item #}
{% if item.isNewItem() and not template_preview %}
{{ include('components/itilobject/mainform_close.html.twig') }}
{% endif %}

</div>

{# Common form fields for CommonITILObject_CommonITILObject purge action #}
Expand Down Expand Up @@ -167,13 +171,15 @@ $(function() {
saveFieldPanelState();
});

var myCollapsible = document.getElementById('itil-data')
myCollapsible.addEventListener('shown.bs.collapse', function () {
saveFieldPanelState();
});
myCollapsible.addEventListener('hidden.bs.collapse', function () {
saveFieldPanelState();
});
var myCollapsible = document.getElementById('itil-data');
if (myCollapsible) {
myCollapsible.addEventListener('shown.bs.collapse', function () {
saveFieldPanelState();
});
myCollapsible.addEventListener('hidden.bs.collapse', function () {
saveFieldPanelState();
});
}

var itil_layout = {
collapsed: false,
Expand Down