Attachment 174396 Details for Bug 31391 – Bug 31391: (follow-up) Include changed requirements of patron autocomplete, datatable

[patch] Bug 31391: (follow-up) Include changed requirements of patron autocomplete, datatable

Bug-31391-follow-up-Include-changed-requirements-o.patch (text/plain), 3.71 KB, created by Aleisha Amohia on 2024-11-12 01:09:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2024-11-12 01:09:49 UTC

Size: 3.71 KB

patch

obsolete

>From 440a46ff4fc056ea8485151efef53ab61899c02b Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Tue, 12 Nov 2024 01:08:59 +0000
>Subject: [PATCH] Bug 31391: (follow-up) Include changed requirements of patron
> autocomplete, datatable
>
>---
> .../prog/en/modules/recalls/request.tt        | 25 +++++++++++--------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>index 7bbd2b26030..ef68de59874 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>@@ -2,18 +2,17 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>-[% USE TablesSettings %]
> [% USE Branches %]
> [% USE Categories %]
> [% USE AuthorisedValues %]
> [% USE ItemTypes %]
>+[% PROCESS 'i18n.inc' %]
>+[% SET footerjs = 1 %]
>+[% INCLUDE 'doc-head-open.inc' %]
> [% SET libraries = Branches.all %]
> [% SET categories = Categories.all.unblessed %]
> [% SET columns = ['name', 'cardnumber', 'dateofbirth', 'category', 'branch', 'address', 'phone'] %]
> [% PROCESS "patron-search.inc" %]
>-[% PROCESS 'i18n.inc' %]
>-[% SET footerjs = 1 %]
>-[% INCLUDE 'doc-head-open.inc' %]
> <title>[% FILTER collapse %]
>     [% t("Place a recall") | html %] &rsaquo;
>     [% t("Recalls") | html %] &rsaquo;
>@@ -268,21 +267,27 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% SET url_biblio_params = "biblionumber=" _ biblio.biblionumber %]
>-    [% PROCESS patron_search_js table_id => 'table_borrowers', categories => categories, libraries => libraries, extended_attribute_types => attribute_type_codes, columns => columns, open_on_row_click => 1, on_click_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_attribute_equal => 'cardnumber' %]
>+    [% UNLESS patron %]
>+        [% SET search_results_block_id = 'recalls_patronsearch_pane_panel' %] [%# adjusting variable for patron-search.inc %]
>+        [% PROCESS patron_search_js table_id => 'table_borrowers', categories => categories, libraries => libraries, columns => columns, open_on_row_click => 1, on_click_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_attribute_equal => 'cardnumber' %]
>+        <script>
>+            $(document).ready(function(){
>+                $("#recalls_patronsearch").on("submit", filter);
>+            });
>+        </script>
>+    [% END %]
>     <script>
>-        table_settings = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %];
>         $.fn.select2.defaults.set("width", "100%" );
>         $.fn.select2.defaults.set("dropdownAutoWidth", true );
>         $(document).ready(function(){
>-            $("#recalls_patronsearch").on("submit", filter);
>             [% UNLESS patron %]
>                 [% IF ( PatronAutoComplete ) %]
>-                    patron_autocomplete($("#search_patron_filter"), { 'link-to': 'recall', 'url-params': '[% url_biblio_params | url %]' });
>+                    patron_autocomplete($(".search_patron_filter"), { 'link-to': 'recall', 'url-params': '[% url_biblio_params | url %]' });
>                 [% END %]
>             [% END %]
>             $("#items").dataTable($.extend(true, {}, dataTablesDefaults, {
>-                'bPaginate': false,
>-                "sDom": '<"top pager"ilf>t',
>+                'paginate': false,
>+                "dom": '<"top pager"ilf>t',
>             }));
> 
>             //Override fieldset styling for dataTables search box
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 31391: 139442 | 139443 | 139444 | 139446 | 139642 | 139643 | 139644 | 139645 | 141474 | 142594 | 143155 | 144104 | 144105 | 144131 | 144132 | 144133 | 144134 | 144135 | 144136 | 147581 | 147582 | 150485 | 150486 | 150487 | 150488 | 150489 | 150490 | 150491 | 156995 | 156996 | 156997 | 156998 | 156999 | 157000 | 157001 | 158691 | 158692 | 158693 | 158694 | 158695 | 158825 | 158826 | 158827 | 158828 | 158829 | 158830 | 158831 | 158832 | 172166 | 172167 | 172168 | 172169 | 172170 | 172171 | 172172 | 172173 | 172174 | 172175 | 173839 | 173840 | 173841 | 173842 | 173843 | 173844 | 173845 | 173846 | 173847 | 174396 | 174822 | 174823 | 174824 | 174825 | 174826 | 174827 | 174828 | 174829 | 174830 | 174831