Bugzilla – Attachment 177796 Details for
Bug 38664
Tidy the whole codebase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38664: Revert changes for virtualshelves/tables/shelves_results.tt
Bug-38664-Revert-changes-for-virtualshelvestabless.patch (text/plain), 9.99 KB, created by
Jonathan Druart
on 2025-02-11 21:30:20 UTC
(
hide
)
Description:
Bug 38664: Revert changes for virtualshelves/tables/shelves_results.tt
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-02-11 21:30:20 UTC
Size:
9.99 KB
patch
obsolete
>From 288abfed919bf0649d0d2949a19587dfc2472288 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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": "<a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% d.shelfnumber | html %]">[% d.shelfname | html | $To %]</a>", "dt_count": >- "[% tnx('{count} item', '{count} items', count, { count = d.count }) | $raw %]", "dt_is_shared": "[% IF d.public %]<span>Public</span>[% ELSIF d.is_shared %]<span>Shared</span>[% ELSE %]<span>Private</span>[% END %]", "dt_owner": "<a >- href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% d.owner | html %]" >- >[% d.firstname | html | $To %] [% d.surname | html | $To %]</a >- >", "dt_sortby": >- [% IF d.sortby == "author" %] >- "<span>Author</span>" >- [% ELSIF d.sortby == "copyrightdate" %] >- "<span>Year</span>" >- [% ELSIF d.sortby == "itemcallnumber" %] >- "<span>Call number</span>" >- [% ELSIF d.sortby == "dateadded" %] >- "<span>Date added</span>" >- [% ELSE %] >- "<span>Title</span>" >- [% 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": >+ "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% d.shelfnumber | html %]'>[% d.shelfname | html | $To %]</a>", >+ "dt_count": >+ "[% tnx('{count} item', '{count} items', count, { count = d.count }) | $raw %]", >+ "dt_is_shared": >+ "[% IF d.public %]<span>Public</span>[% ELSIF d.is_shared %]<span>Shared</span>[% ELSE %]<span>Private</span>[% END %]", >+ "dt_owner": >+ "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% d.owner | html %]'>[% d.firstname | html | $To %] [% d.surname | html | $To %]</a>", >+ "dt_sortby": >+ [% IF d.sortby == "author" %]"<span>Author</span>"[% ELSIF d.sortby == "copyrightdate" %]"<span>Year</span>"[% ELSIF d.sortby == "itemcallnumber" %]"<span>Call number</span>"[% ELSIF d.sortby == "dateadded" %]"<span>Date added</span>"[% ELSE %]"<span>Title</span>"[% 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 = '<form action="shelves.pl" method="get">' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >- [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa-solid fa-pencil" aria-hidden="true"></i> ' _ t("Edit") _ '</button>' ~%] >- [%~ action_block = action_block _ '</form> ' ~%] >- [%~ END ~%] >- [%~ IF can_delete_shelf ~%] >- [%~ action_block = action_block _ ' <form action="shelves.pl" method="post">' ~%] >- [%~ action_block = BLOCK ~%][%~ action_block | $raw ~%][%~ INCLUDE 'csrf-token.inc' | trim ~%][%~ END ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="op" value="cud-delete" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >- [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash-can"></i> ' _ t("Delete") _ '</button>' ~%] >- [%~ action_block = action_block _ '</form>' ~%] >- [%~ END ~%] >- [%~ IF public AND allow_transfer ~%] >- [%~ action_block = action_block _ ' <form action="shelves.pl" method="get">' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="op" value="transfer" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="public" value="1" />' ~%] >- [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >- [%~ action_block = action_block _ '<button type="submit" class="btn btn-default btn-xs"><i class="fa"></i> ' _ t("Transfer") _ '</button>' ~%] >- [%~ action_block = action_block _ '</form>' ~%] >- [%~ 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 = '<form action="shelves.pl" method="get">' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >+ [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa-solid fa-pencil" aria-hidden="true"></i> ' _ t("Edit") _ '</button>' ~%] >+ [%~ action_block = action_block _ '</form> ' ~%] > [%~ END ~%] >- [%~ To.json(action_block) | $raw ~%] >+ [%~ IF can_delete_shelf ~%] >+ [%~ action_block = action_block _ ' <form action="shelves.pl" method="post">' ~%] >+ [%~ action_block = BLOCK ~%][%~ action_block | $raw ~%][%~ INCLUDE 'csrf-token.inc' | trim ~%][%~ END ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="op" value="cud-delete" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >+ [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash-can"></i> ' _ t("Delete") _ '</button>' ~%] >+ [%~ action_block = action_block _ '</form>' ~%] >+ [%~ END ~%] >+ [%~ IF public AND allow_transfer ~%] >+ [%~ action_block = action_block _ ' <form action="shelves.pl" method="get">' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="op" value="transfer" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="public" value="1" />' ~%] >+ [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >+ [%~ action_block = action_block _ '<button type="submit" class="btn btn-default btn-xs"><i class="fa"></i> ' _ t("Transfer") _ '</button>' ~%] >+ [%~ action_block = action_block _ '</form>' ~%] >+ [%~ END ~%] >+[%~ ELSE ~%] >+ [%~ SET action_block = 'None' ~%] >+[%~ END ~%] >+[%~ To.json(action_block) | $raw ~%] >+ > [%~ END ~%] >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38664
:
175488
|
175664
|
177755
| 177796 |
177797
|
177798
|
177799
|
177800
|
177801
|
177802
|
177813
|
177825
|
177826
|
177827