Attachment 173486 Details for Bug 33484 – Bug 33484: Do not consider we loaded from state if search was not saved

[patch] Bug 33484: Do not consider we loaded from state if search was not saved

Bug-33484-Do-not-consider-we-loaded-from-state-if-.patch (text/plain), 2.31 KB, created by Jonathan Druart on 2024-10-28 09:46:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-10-28 09:46:57 UTC

Size: 2.31 KB

patch

obsolete

>From aee5ec7165dc6c9e12056f07778a09a10601b650 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 24 Oct 2024 10:44:40 +0200
>Subject: [PATCH] Bug 33484: Do not consider we loaded from state if search was
> not saved
>
>The loaded_from_state flag is used to know if we defer the loading of
>the table or not.
>We should not display the result (ie not defer loading) if only the
>configuration has been retrieved from localStorage.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/en/includes/columns_settings.inc      | 5 +++--
> koha-tmpl/intranet-tmpl/prog/js/datatables.js                | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>index 30146653da2..46411008b07 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>@@ -54,11 +54,12 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters) {
> 
>             state = JSON.parse(state);
> 
>-            if (!default_save_state_search ) {
>+            if (default_save_state_search ) {
>+                settings.loaded_from_state = true;
>+            } else {
>                 delete state.search;
>                 state.columns.forEach(c => delete c.search );
>             }
>-            settings.loaded_from_state = true;
>             return state;
>         }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>index 3388b187d39..257eb8b1c76 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>@@ -999,11 +999,12 @@ function _dt_save_restore_state(table_settings, external_filter_nodes={}){
> 
>         state = JSON.parse(state);
> 
>-        if (!default_save_state_search ) {
>+        if (default_save_state_search ) {
>+            settings.loaded_from_state = true;
>+        } else {
>             delete state.search;
>             state.columns.forEach(c => delete c.search );
>         }
>-        settings.loaded_from_state = true;
>         return state;
>     }
> 
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33484: 149444 | 149445 | 149447 | 149448 | 149449 | 149925 | 149926 | 149927 | 149928 | 149929 | 149930 | 149974 | 149975 | 149976 | 149977 | 149978 | 149979 | 173443 | 173444 | 173445 | 173446 | 173447 | 173448 | 173449 | 173450 | 173451 | 173452 | 173453 | 173454 | 173455 | 173456 | 173457 | 173458 | 173459 | 173460 | 173461 | 173462 | 173463 | 173464 | 173465 | 173466 | 173467 | 173468 | 173469 | 173470 | 173471 | 173472 | 173473 | 173474 | 173475 | 173476 | 173477 | 173478 | 173479 | 173480 | 173481 | 173482 | 173483 | 173484 | 173485 | 173486 | 173546 | 173606 | 173607 | 173985 | 174219