composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1386 - Advanced Search: Navigation in list - Browse this list - fix display

Browse Source
This commit is contained in:
acognet
2023-05-24 11:41:06 +02:00
parent 1df7c3d8f3
commit 9ebcbf2459
9 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/base/components/datatable/layout.ready.js.twig
View File

@@ -111,7 +111,6 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
e.preventDefault();
});
{% else %}
$('#{{ oUIBlock.GetId() }}_wrapper').find('.object-in-basket').on('click',
function (event) {
event.preventDefault();
@@ -150,7 +149,6 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
e.preventDefault();
});
{% else %}
$('#{{ oUIBlock.GetId() }}_wrapper').find('.object-in-basket').on('click',
function (event) {
event.preventDefault();
@@ -164,7 +162,6 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
$('#basket{{ oUIBlock.GetId() }}').submit();
}
);
{% endif %}
},
{% endif %}
@@ -479,5 +476,4 @@ if (window.ResizeObserver)
{% if oUIBlock.HasRowActions() %}
{% include 'base/components/datatable/row-actions/handler.js.twig' %}
{% endif %}
console.warn('ici-lala');
{% endif %}

4
templates/base/components/navigation/layout.html.twig
View File

@@ -4,9 +4,9 @@
class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} {{ oUIBlock.GetCSSColorClass() }} {% if oUIBlock.IsHidden() %}ibo-is-hidden{% endif %} ibo-is-opened" data-role="ibo-navigation">
{% block iboNavigation %}
<form id="ibo-form-navigation" class="ibo-navigation-form" method="post">
<input type="hidden" name="listNavigation" value="{{ oUIBlock.GetList() }}"/>
<input type="hidden" name="list_navigation" value="{{ oUIBlock.GetList() }}"/>
<input type="hidden" name="filter" value="{{ oUIBlock.GetFilter() }}"/>
<input type="hidden" name="back-url" value="{{ oUIBlock.GetBackUrl()|raw }}"/>
<input type="hidden" name="back_url" value="{{ oUIBlock.GetBackUrl()|raw }}"/>
<div class="ibo-form-navigation--nav fas fa-angle-up" id="{{ oUIBlock.GetId() }}-back"></div>
{% if oUIBlock.HasPrec() %}
<div class="ibo-form-navigation--nav fas fa-angle-double-left" id="{{ oUIBlock.GetId() }}-first"></div>

2
templates/base/components/navigation/layout.js.twig
View File

@@ -1,6 +1,6 @@
{# @copyright Copyright (C) 2010-2021 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
console.warn('ICI');
$('#{{ oUIBlock.GetId() }}-back').on('click', function () {
window.location = '{{ oUIBlock.GetBackUrl()|raw }}';
});