Bugzilla – Attachment 165939 Details for
Bug 33260
Show message queue on staff interface and make notices printable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33260: (follow-up) Fix search forms on notices mgmt page
Bug-33260-follow-up-Fix-search-forms-on-notices-mg.patch (text/plain), 6.00 KB, created by
Aleisha Amohia
on 2024-05-01 03:53:28 UTC
(
hide
)
Description:
Bug 33260: (follow-up) Fix search forms on notices mgmt page
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2024-05-01 03:53:28 UTC
Size:
6.00 KB
patch
obsolete
>From c2dce007932f9b1b9497e5b0fa7704c6214e3aac Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Mon, 29 Apr 2024 01:54:43 +0000 >Subject: [PATCH] Bug 33260: (follow-up) Fix search forms on notices mgmt page > >--- > .../prog/en/modules/tools/notices.tt | 35 ++++++++++++------- > tools/notices.pl | 2 +- > 2 files changed, 23 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >index f29aa39a137..caa1b0f184c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >@@ -6,11 +6,16 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Notices management › Tools › Koha</title> >+[% PROCESS 'i18n.inc' %] > [% PROCESS "patron-search.inc" %] > [% SET libraries = Branches.all %] > [% SET categories = Categories.all.unblessed %] > [% SET columns = ['name', 'cardnumber', 'dateofbirth', 'category', 'branch', 'address', 'phone'] %] >+<title>[% FILTER collapse %] >+ [% t("Notices management") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .notice { display: none; } >@@ -54,6 +59,7 @@ > <span id="checkbox_actions"><a href="#" class="select_all"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="clear_all"><i class="fa fa-remove"></i> Clear all</a></span> > > <form id="print_multiple" action="/cgi-bin/koha/tools/print_notice.pl" method="post" target="_blank"> >+ [% INCLUDE 'csrf-token.inc' %] > > <table id="notices"> > <thead> >@@ -94,17 +100,18 @@ > [% ELSE %] > > Use the search form on the left to find sent notices, or go directly to a patron's notices. >- <div id="notices_patronsearch" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"><a href="#notices_patronsearch_pane" aria-controls="notices_patronsearch_pane" role="tab" data-toggle="tab">Patrons</a></li> >- </ul> >- <div class="tab-content"> >- <div id="notice_patronsearch_pane" role="tabpanel" class="tab-pane active"> >+ >+ [% WRAPPER tabs id= "notices_patronsearch" %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "notices_patronsearch_pane" bt_active= 1 %] <span>Patrons</span> [% END %] >+ [% END %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="notices_patronsearch_pane" bt_active= 1 %] > [% PROCESS patron_search_filters_simple %] > [% PROCESS patron_search_table table_id => 'table_borrowers', open_on_row_click => 1 %] >- </div> >- </div> >- </div> >+ [% END %] >+ [% END %] >+ [% END %] > > [% IF notices && notices.count == 0 %] > >@@ -123,7 +130,8 @@ > <aside> > <fieldset class="sidebar brief"> > <form id="notices-search" action="/cgi-bin/koha/tools/notices.pl" method="post"> >- <input type="hidden" name="op" value="search"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="op" value="cud-search"> > <h3>Search filters</h3> > <ol> > <li> >@@ -243,7 +251,6 @@ > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% 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/tools/notices.pl?', redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/tools/notices.pl?', redirect_if_attribute_equal => 'cardnumber' %] > > <script> > table_settings = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]; >@@ -274,7 +281,7 @@ > $("#notices_patronsearch").on("submit", filter); > [% UNLESS notices %] > [% IF ( Koha.Preference('PatronAutoComplete') ) %] >- patron_autocomplete($("#search_patron_filter"), { 'link-to': 'notices', 'url-params': '[% url_biblio_params | url %]' }); >+ patron_autocomplete($(".search_patron_filter"), { 'link-to': 'notices' }); > [% END %] > [% END %] > >@@ -303,6 +310,8 @@ > }); > </script> > >+ [% SET search_results_block_id = 'notices_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/members/notices.pl?', redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/members/notices.pl?', redirect_if_attribute_equal => 'cardnumber' %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/tools/notices.pl b/tools/notices.pl >index 432046d1d8e..5ac78e81892 100755 >--- a/tools/notices.pl >+++ b/tools/notices.pl >@@ -39,7 +39,7 @@ unless ( C4::Context->preference('NoticesManagement') ) { > > my $op = $query->param('op'); > >-if ( $op and $op eq 'search' ) { >+if ( $op and $op eq 'cud-search' ) { > my $letter_code = $query->param('letter_code') || undef; > my $categorycode = $query->param('categorycode') || undef; > my $branchcode = $query->param('branchcode') || undef; >-- >2.39.2
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 33260
:
148437
|
148438
|
148439
|
148440
|
148943
|
149009
|
149413
|
149581
|
149593
|
149594
|
149595
|
149596
|
149597
|
149598
|
150346
|
150347
|
154927
|
154928
|
157383
|
157384
|
157385
|
157386
|
158852
|
158853
|
158854
|
158855
|
162570
|
162571
|
162572
|
162573
|
162574
|
162624
|
162625
|
162677
|
162678
|
162679
|
162680
|
162681
|
164783
|
164784
|
164785
|
164786
|
164787
|
165238
|
165239
|
165717
|
165939
|
165946
|
165947
|
165948
|
165949
|
165950
|
165951
|
166020
|
166178
|
166335
|
166336
|
166337
|
166338
|
166339
|
166340
|
166341
|
166342
|
166343
|
166344
|
166345
|
166362
|
166363
|
166364
|
166365
|
166366
|
166367
|
166368
|
166369
|
166370
|
166371
|
166372
|
166373