From 288abfed919bf0649d0d2949a19587dfc2472288 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 11 Feb 2025 21:34:30 +0100 Subject: [PATCH] Bug 38664: Revert changes for virtualshelves/tables/shelves_results.tt --- .../virtualshelves/tables/shelves_results.tt | 127 ++++++++++-------- 1 file changed, 68 insertions(+), 59 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index c8f9522626f..f47f7c6273f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -2,65 +2,74 @@ [% USE KohaDates %] [% USE To %] [% PROCESS 'i18n.inc' %] -{ "draw": [% draw | html %], "recordsTotal": [% recordsTotal | html %], "recordsFiltered": [% recordsFiltered | html %], "data": [ -[% FOREACH d IN data %] - { "dt_public": "[% d.public | html %]", "dt_shelfname": "[% d.shelfname | html | $To %]", "dt_count": - "[% tnx('{count} item', '{count} items', count, { count = d.count }) | $raw %]", "dt_is_shared": "[% IF d.public %]Public[% ELSIF d.is_shared %]Shared[% ELSE %]Private[% END %]", "dt_owner": "[% d.firstname | html | $To %] [% d.surname | html | $To %]", "dt_sortby": - [% IF d.sortby == "author" %] - "Author" - [% ELSIF d.sortby == "copyrightdate" %] - "Year" - [% ELSIF d.sortby == "itemcallnumber" %] - "Call number" - [% ELSIF d.sortby == "dateadded" %] - "Date added" - [% ELSE %] - "Title" - [% END %], - "dt_created_on": "[% d.created_on | $KohaDates %]", "dt_modification_time": "[% d.modification_time | $KohaDates %]", "dt_action": - "[% PROCESS action_form shelfnumber=d.shelfnumber can_manage_shelf=d.can_manage_shelf can_delete_shelf=d.can_delete_shelf type=d.type %]" }[% UNLESS loop.last %],[% END %] -[% END %] -] } +{ + "draw": [% draw | html %], + "recordsTotal": [% recordsTotal | html %], + "recordsFiltered": [% recordsFiltered | html %], + "data": [ + [% FOREACH d IN data %] + { + "dt_public": + "[% d.public | html %]", + "dt_shelfname": + "[% d.shelfname | html | $To %]", + "dt_count": + "[% tnx('{count} item', '{count} items', count, { count = d.count }) | $raw %]", + "dt_is_shared": + "[% IF d.public %]Public[% ELSIF d.is_shared %]Shared[% ELSE %]Private[% END %]", + "dt_owner": + "[% d.firstname | html | $To %] [% d.surname | html | $To %]", + "dt_sortby": + [% IF d.sortby == "author" %]"Author"[% ELSIF d.sortby == "copyrightdate" %]"Year"[% ELSIF d.sortby == "itemcallnumber" %]"Call number"[% ELSIF d.sortby == "dateadded" %]"Date added"[% ELSE %]"Title"[% END %], + "dt_created_on": + "[% d.created_on | $KohaDates %]", + "dt_modification_time": + "[% d.modification_time | $KohaDates %]", + "dt_action": + "[% PROCESS action_form shelfnumber=d.shelfnumber can_manage_shelf=d.can_manage_shelf can_delete_shelf=d.can_delete_shelf type=d.type %]" + }[% UNLESS loop.last %],[% END %] + [% END %] + ] +} + [% BLOCK action_form -%] - [%~ SET action_block = '' ~%] - [%~ IF can_manage_shelf OR can_delete_shelf ~%] - [%~ shelfnumber = shelfnumber | html ~%] - [%~ public = public | html ~%] - [%~ IF can_manage_shelf ~%] - [%~ action_block = '
' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '
' ~%] - [%~ END ~%] - [%~ IF can_delete_shelf ~%] - [%~ action_block = action_block _ '
' ~%] - [%~ action_block = BLOCK ~%][%~ action_block | $raw ~%][%~ INCLUDE 'csrf-token.inc' | trim ~%][%~ END ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '
' ~%] - [%~ END ~%] - [%~ IF public AND allow_transfer ~%] - [%~ action_block = action_block _ '
' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '
' ~%] - [%~ END ~%] - [%~ ELSE ~%] - [%~ SET action_block = 'None' ~%] +[%~ SET action_block = '' ~%] +[%~ IF can_manage_shelf OR can_delete_shelf ~%] + [%~ shelfnumber = shelfnumber | html ~%] + [%~ public = public | html ~%] + [%~ IF can_manage_shelf ~%] + [%~ action_block = '
' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '
' ~%] [%~ END ~%] - [%~ To.json(action_block) | $raw ~%] + [%~ IF can_delete_shelf ~%] + [%~ action_block = action_block _ '
' ~%] + [%~ action_block = BLOCK ~%][%~ action_block | $raw ~%][%~ INCLUDE 'csrf-token.inc' | trim ~%][%~ END ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '
' ~%] + [%~ END ~%] + [%~ IF public AND allow_transfer ~%] + [%~ action_block = action_block _ '
' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '
' ~%] + [%~ END ~%] +[%~ ELSE ~%] + [%~ SET action_block = 'None' ~%] +[%~ END ~%] +[%~ To.json(action_block) | $raw ~%] + [%~ END ~%] -- 2.34.1