Bugzilla – Attachment 162444 Details for
Bug 35329
Move patron searches to a modal
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35329: Move patron search to modal - remove members/search.pl
Bug-35329-Move-patron-search-to-modal---remove-mem.patch (text/plain), 6.23 KB, created by
Jonathan Druart
on 2024-02-26 14:37:33 UTC
(
hide
)
Description:
Bug 35329: Move patron search to modal - remove members/search.pl
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2024-02-26 14:37:33 UTC
Size:
6.23 KB
patch
obsolete
>From cff28fb867cdfdaf53eda6f43058d62726a45778 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 9 Jan 2024 13:42:54 +0100 >Subject: [PATCH] Bug 35329: Move patron search to modal - remove > members/search.pl > > git grep members/search.pl >should not return any results > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/members/search.tt | 84 ------------------- > members/search.pl | 50 ----------- > 2 files changed, 134 deletions(-) > delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt > delete mode 100755 members/search.pl > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >deleted file mode 100644 >index 01adca73c5f..00000000000 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ /dev/null >@@ -1,84 +0,0 @@ >-[% USE raw %] >-[% USE Asset %] >-[% USE Koha %] >-[% USE Branches %] >-[% USE Categories %] >-[% PROCESS 'i18n.inc' %] >-[% SET footerjs = 1 %] >-[% INCLUDE 'doc-head-open.inc' %] >-[% SET libraries = Branches.all %] >-[% SET categories = Categories.all.unblessed %] >-[% PROCESS 'patron-search.inc' %] >-<title>[% FILTER collapse %] >- [% t("Patron search") | html %] › >- [% t("Patrons") | html %] › >- [% t("Koha") | html %] >-[% END %]</title> >-[% INCLUDE 'doc-head-close.inc' %] >-<style> .modal-body .close { display: none; } </style>[%# FIXME This is not great, we should make members/memberentrygen.tt use a modal as well and we won't need that here %] >-</head> >- >-<body id="common_patron_search" class="common"> >-<div id="patron_search"> >- <div class="container-fluid"> >- >- [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['branch','category','sort1','sort2'], search_filter => searchmember %] >- </form> >- >- <div id="searchresults"> >- [% IF columns.grep('checkbox').size %] >- <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;"> >- <div> >- <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a> >- | >- <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a> >- [% IF selection_type == 'add' %] >- <button id="add-selected" class="btn btn-sm btn-default" type="submit">Add selected patrons</button> >- [% END %] >- </div> >- </div> >- [% END %] >- [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] >- </div> >- >- <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >- >- </div> >-</div> >- >-[% MACRO jsinclude BLOCK %] >-[% INCLUDE 'select2.inc' %] >-<script> >- $(document).ready(function() { >- $("#select_all").on("click",function(e){ >- e.preventDefault(); >- $(".selection").prop("checked", true).change(); >- }); >- $("#clear_all").on("click",function(e){ >- e.preventDefault(); >- $(".selection").prop("checked", false).change(); >- }); >- $("#searchheader").hide(); >- $("#patron_search_form").on('submit', function(){$("#searchheader").show();}); >- $("#clear_search").on("click",function(e){$("#searchheader").hide();}); >- >- $('#add-selected').on('click', function(e) { >- e.preventDefault(); >- var counter = 0; >- $('tr:has(.selection:checked) .add_user').each(function(){ >- var borrowernumber = $(this).data('borrowernumber'); >- var firstname = $(this).data('firstname'); >- var surname = $(this).data('surname'); >- add_user( borrowernumber, firstname + ' ' + surname ); >- counter++; >- }); >- $('#info').html(_("%s Patrons added.").format(counter)); >- }); >- }); >-</script> >- >- [% PROCESS patron_search_js table_id => 'memberresultst', categories => categories, libraries => libraries, columns => columns, filter => filter, actions => [selection_type], preview_on_name_click => 1, callback => callback %] >-[% END %] >- >-[% SET popup_window = 1 %] >-[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/members/search.pl b/members/search.pl >deleted file mode 100755 >index 05752ae13d1..00000000000 >--- a/members/search.pl >+++ /dev/null >@@ -1,50 +0,0 @@ >-#!/usr/bin/perl >- >-# This file is part of Koha. >-# >-# Koha is free software; you can redistribute it and/or modify it >-# under the terms of the GNU General Public License as published by >-# the Free Software Foundation; either version 3 of the License, or >-# (at your option) any later version. >-# >-# Koha is distributed in the hope that it will be useful, but >-# WITHOUT ANY WARRANTY; without even the implied warranty of >-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >-# GNU General Public License for more details. >-# >-# You should have received a copy of the GNU General Public License >-# along with Koha; if not, see <http://www.gnu.org/licenses>. >- >-use Modern::Perl; >- >-use CGI qw ( -utf8 ); >-use C4::Context; >-use C4::Auth qw( get_template_and_user ); >-use C4::Output qw( output_html_with_http_headers ); >-use Koha::Patron::Attribute::Types; >- >-my $input = CGI->new; >- >-my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user( >- { template_name => "members/search.tt", >- query => $input, >- type => "intranet", >- flagsrequired => { catalogue => '*' }, >- } >-); >- >-my $referer = $input->referer(); >- >-my @columns = split ',', $input->param('columns'); >-my $callback = $input->param('callback'); >-my $selection_type = $input->param('selection_type') || 'select'; >-my $filter = $input->param('filter'); >- >-$template->param( >- view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results", >- callback => $callback, >- columns => \@columns, >- filter => $filter, >- selection_type => $selection_type, >-); >-output_html_with_http_headers( $input, $cookie, $template->output ); >-- >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 35329
:
160698
|
160699
|
160700
|
160701
|
160702
|
160703
|
160704
|
160705
|
160706
|
160728
|
160729
|
160733
|
160734
|
160735
|
160736
|
160737
|
160738
|
160739
|
160740
|
160741
|
160742
|
160743
|
160759
|
160760
|
160761
|
160762
|
160763
|
160768
|
160769
|
160770
|
160771
|
160773
|
160774
|
160940
|
160941
|
160943
|
160944
|
160945
|
160946
|
160947
|
160948
|
160949
|
160950
|
160951
|
160952
|
160953
|
160954
|
160955
|
160956
|
160957
|
160958
|
160959
|
161165
|
161166
|
161183
|
161184
|
161185
|
161186
|
161187
|
161188
|
161189
|
161190
|
161191
|
161192
|
161193
|
161194
|
161195
|
161196
|
161197
|
161198
|
161199
|
161259
|
161260
|
161274
|
161275
|
161276
|
161277
|
161278
|
161279
|
161280
|
161281
|
161282
|
161283
|
161284
|
161285
|
161286
|
161287
|
161288
|
161289
|
161290
|
161291
|
161292
|
161293
|
161294
|
161295
|
161398
|
161399
|
161400
|
161401
|
161402
|
161403
|
161404
|
161405
|
161406
|
161407
|
161408
|
161409
|
161410
|
161411
|
161412
|
161413
|
161414
|
161415
|
161416
|
161417
|
162436
|
162437
|
162438
|
162439
|
162440
|
162441
|
162442
|
162443
| 162444 |
162445
|
162446
|
162447
|
162448
|
162449
|
162450
|
162451
|
162452
|
162453
|
162454
|
162455
|
162456
|
162457
|
162670
|
162671
|
162713
|
162714