maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

rewirk tablecolum js a bit when more than once tablelisting is on one page; do not allow empty column selection

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-16 17:10:57 +02:00
parent 1704875cea
commit 71274f8f08
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Froxlor/Ajax/Ajax.php
View File

@@ -219,11 +219,14 @@ class Ajax
private function updateTablelisting()
{
$columns = [];
foreach (Request::get('columns') as $value) {
foreach ((Request::get('columns') ?? []) as $value) {
$columns[] = $value;
}
Listing::storeColumnListingForUser([Request::get('listing') => $columns]);
return $this->jsonResponse($columns);
if (!empty($columns)) {
Listing::storeColumnListingForUser([Request::get('listing') => $columns]);
return $this->jsonResponse($columns);
}
return $this->errorResponse('At least one column must be selected', 406);
}
private function resetTablelisting()

4
templates/Froxlor/form/formfields.html.twig
View File

@@ -1,6 +1,6 @@
{% macro fieldrow(id, field, norow = false, nohide = false, em = false) %}
{% if field.visible is not defined or (field.visible is defined and field.visible) or nohide == true %}
{% if norow == false and field.type != 'hidden' %}
{% if norow == false and (field.type != 'hidden' or (field.type == 'hidden' and field.display is defined and field.display is not empty)) %}
<div class="row g-0 formfield d-flex align-items-center">
{% if field.label is iterable %}
<label for="{{ id }}" class="col-sm-6 col-form-label pe-3">
@@ -56,7 +56,7 @@
{% if field.note is defined and field.note is not empty %}
<small class="text-info">{{ field.note|raw }}</small>
{% endif %}
{% if norow == false and field.type != 'hidden' %}
{% if norow == false and (field.type != 'hidden' or (field.type == 'hidden' and field.display is defined and field.display is not empty)) %}
</div>
</div>
{% endif %}

19
templates/Froxlor/src/js/components/tablecolumns.js
View File

@@ -2,14 +2,12 @@ $(function () {
/*
* table columns - manage columns modal
*/
let form = $('#manageColumnsModal form');
form.on('submit', function (event) {
$('.manageColumnsModal form').on('submit', function (event) {
$.ajax({
url: 'lib/ajax.php?action=updatetablelisting&listing=' + form.data('listing') + '&theme=' + window.$theme,
url: 'lib/ajax.php?action=updatetablelisting&listing=' + $(this).data('listing') + '&theme=' + window.$theme,
type: 'POST',
dataType: 'json',
data: form.serialize(),
data: $(this).serialize(),
success: function () {
window.location.href = '';
},
@@ -20,7 +18,8 @@ $(function () {
event.preventDefault();
});
$('#manageColumnsModal form #reset').on('click', function () {
$('.manageColumnsModal form button[data-action="reset"]').on('click', function () {
var form = $(this).parents('form:first');
$.ajax({
url: 'lib/ajax.php?action=resettablelisting&listing=' + form.data('listing') + '&theme=' + window.$theme,
type: 'POST',
@@ -35,11 +34,11 @@ $(function () {
});
});
$('#manageColumnsModal form #select-all').on('click', function () {
$('#manageColumnsModal form input:checkbox').prop('checked', true);
$('.manageColumnsModal form button[data-action="select-all"]').on('click', function () {
$(this).parents('form:first').find('input:checkbox').prop('checked', true);
});
$('#manageColumnsModal form #unselect-all').on('click', function () {
$('#manageColumnsModal form input:checkbox').prop('checked', false);
$('.manageColumnsModal form button[data-action="unselect-all"]').on('click', function () {
$(this).parents('form:first').find('input:checkbox').prop('checked', false);
});
});

18
templates/Froxlor/table/table.html.twig
View File

@@ -15,9 +15,9 @@
{% if gSearchText is not empty %}
<span class="me-2"><a href="{{ linker(listing.self_overview) }}"><i class="fa-solid fa-xmark"></i></a> Filter: <strong>{{ gSearchText }}</strong></span>
{% endif %}
<span type="button" data-bs-toggle="modal" data-bs-target="#searchColumnsModal" class="me-2"><i class="fa-solid fa-search"></i></span>
<span type="button" data-bs-toggle="modal" data-bs-target="#searchColumnsModal-{{ listing.id }}" class="me-2"><i class="fa-solid fa-search"></i></span>
{% endif %}
<span type="button" data-bs-toggle="modal" data-bs-target="#manageColumnsModal"><i class="fa-solid fa-cog"></i></span>
<span type="button" data-bs-toggle="modal" data-bs-target="#manageColumnsModal-{{ listing.id }}"><i class="fa-solid fa-cog"></i></span>
</div>
</div>
<div class="card table-responsive">
@@ -67,11 +67,11 @@
{% endif %}
<!-- Modal -->
<div class="modal fade" id="manageColumnsModal" tabindex="-1" aria-labelledby="manageColumnsModalLabel" aria-hidden="true">
<div class="modal fade manageColumnsModal" id="manageColumnsModal-{{ listing.id }}" tabindex="-1" aria-labelledby="manageColumnsModalLabel-{{ listing.id }}" aria-hidden="true">
<div class="modal-dialog">
<form method="POST" class="modal-content" data-listing="{{ listing.id }}">
<div class="modal-header">
<h5 class="modal-title" id="manageColumnsModalLabel">{{ lng('panel.managetablecolumnsmodal.title') }}</h5>
<h5 class="modal-title" id="manageColumnsModalLabel-{{ listing.id }}">{{ lng('panel.managetablecolumnsmodal.title') }}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
@@ -86,9 +86,9 @@
{% endfor %}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" id="select-all">{{ lng('panel.select_all') }}</button>
<button type="button" class="btn btn-secondary" id="unselect-all">{{ lng('panel.unselect_all') }}</button>
<button type="button" class="btn btn-secondary" id="reset">{{ lng('panel.default') }}</button>
<button type="button" class="btn btn-secondary" data-action="select-all">{{ lng('panel.select_all') }}</button>
<button type="button" class="btn btn-secondary" data-action="unselect-all">{{ lng('panel.unselect_all') }}</button>
<button type="button" class="btn btn-secondary" data-action="reset">{{ lng('panel.default') }}</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ lng('panel.modalclose') }}</button>
<button type="submit" class="btn btn-primary">{{ lng('panel.save') }}</button>
</div>
@@ -98,11 +98,11 @@
{% if listing.no_search is not defined or (listing.no_search is defined and listing.no_search == false) %}
<!-- Modal -->
<div class="modal fade" id="searchColumnsModal" tabindex="-1" aria-labelledby="searchColumnsModalLabel" aria-hidden="true">
<div class="modal fade searchColumnsModal" id="searchColumnsModal-{{ listing.id }}" tabindex="-1" aria-labelledby="searchColumnsModalLabel-{{ listing.id }}" aria-hidden="true">
<div class="modal-dialog">
<form method="GET" class="modal-content" action="{{ linker(listing.self_overview) }}">
<div class="modal-header">
<h5 class="modal-title" id="searchColumnsModalLabel">{{ lng('panel.searchtablecolumnsmodal.title') }}</h5>
<h5 class="modal-title" id="searchColumnsModalLabel-{{ listing.id }}">{{ lng('panel.searchtablecolumnsmodal.title') }}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">