Bugzilla – Attachment 46607 Details for
Bug 14610
Add ability to place article requests in Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14610 [QA Followup] - Add non-ajax patron search
Bug-14610-QA-Followup---Add-non-ajax-patron-search.patch (text/plain), 4.92 KB, created by
Kyle M Hall (khall)
on 2016-01-13 16:45:45 UTC
(
hide
)
Description:
Bug 14610 [QA Followup] - Add non-ajax patron search
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-01-13 16:45:45 UTC
Size:
4.92 KB
patch
obsolete
>From cf2f76071a73b425261f5b713c16754ce689bfd8 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 13 Jan 2016 13:44:10 +0000 >Subject: [PATCH] Bug 14610 [QA Followup] - Add non-ajax patron search > >--- > circ/request-article.pl | 25 +++++++++++++- > .../prog/en/modules/circ/request-article.tt | 39 ++++++++++++++++++++-- > 2 files changed, 61 insertions(+), 3 deletions(-) > >diff --git a/circ/request-article.pl b/circ/request-article.pl >index 7881efd..448cac8 100755 >--- a/circ/request-article.pl >+++ b/circ/request-article.pl >@@ -21,6 +21,7 @@ use Modern::Perl; > > use C4::Output; > use C4::Auth; >+use C4::Utils::DataTables::Members; > use Koha::Biblios; > use Koha::Borrowers; > use Koha::ArticleRequests; >@@ -39,9 +40,31 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( > > my $biblionumber = $input->param('biblionumber'); > my $patron_cardnumber = $input->param('patron_cardnumber'); >+my $patron_id = $input->param('patron_id'); > > my $biblio = Koha::Biblios->find($biblionumber); >-my $patron = $patron_cardnumber ? Koha::Borrowers->find( { cardnumber => $patron_cardnumber } ) : undef; >+my $patron = Koha::Borrowers->find( $patron_id ? $patron_id : { cardnumber => $patron_cardnumber } ); >+ >+if (!$patron && $patron_cardnumber) { >+ my $results = C4::Utils::DataTables::Members::search( >+ { >+ searchmember => $patron_cardnumber, >+ dt_params => { iDisplayLength => -1 }, >+ } >+ ); >+ >+ my $patrons = $results->{patrons}; >+ >+ if ( scalar @$patrons == 1 ) { >+ $patron = Koha::Borrowers->find( $patrons->[0]->{borrowernumber} ); >+ } >+ elsif (@$patrons) { >+ $template->param( patrons => $patrons ); >+ } >+ else { >+ $template->param( no_patrons_found => $patron_cardnumber ); >+ } >+} > > $template->param( > biblio => $biblio, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index 04fae7d..0ce2cc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -112,8 +112,43 @@ $(document).ready(function() { > <div class="yui-b"> > > <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id %]">[% biblio.title | html %]</a></h1> >- >- [% UNLESS patron %] >+ [% IF no_patrons_found %] >+ <div class="dialog alert"> >+ <h3>Patron not found</h3> >+ <p>No patron with this name, please, try another</p> >+ </div> >+ [% ELSIF patrons %] >+ <form id="article_request_patron_results" method="post"> >+ <fieldset> >+ <table id="table_borrowers"> >+ <thead> >+ <tr> >+ <th></th> >+ <th>Name</th> >+ <th>Cardnumber</th> >+ <th>Category</th> >+ <th>Library</th> >+ <th>Address</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH patron IN patrons %] >+ <tr> >+ <td><input type="radio" name="patron_id" value="[% patron.borrowernumber %]"/></td> >+ <td>[% patron.surname %], [% patron.firstname %]</td> >+ <td>[% patron.cardnumber %]</td> >+ <td>[% patron.categorycode %]</td> >+ <td>[% patron.branchcode %]</td> >+ <td>[% patron.address %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <fieldset class="action"><input type="submit" value="Select" /></fieldset> >+ </fieldset> >+ </form> >+ [% ELSIF !patron %] > <form id="article_requests_patronsearch" action="request-article.pl" method="post"> > <fieldset class="brief"> > <label for="patron">Patron: </label> >-- >2.1.4
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 14610
:
42822
|
42823
|
42824
|
42825
|
42826
|
42827
|
42828
|
42829
|
43198
|
43199
|
43200
|
43201
|
43202
|
43264
|
43265
|
43266
|
43267
|
43268
|
43270
|
43271
|
43272
|
43273
|
43274
|
43278
|
43279
|
43280
|
43281
|
43282
|
43654
|
43655
|
43656
|
43657
|
43658
|
44219
|
44220
|
44221
|
44222
|
44223
|
44224
|
44225
|
44226
|
44227
|
44228
|
44229
|
44230
|
44231
|
44232
|
44233
|
44234
|
44235
|
44236
|
44237
|
44238
|
44239
|
44240
|
44241
|
44242
|
44916
|
44917
|
44918
|
44919
|
44920
|
44921
|
44922
|
44923
|
44924
|
44925
|
44926
|
45946
|
45947
|
45948
|
45949
|
45950
|
45951
|
45952
|
45953
|
45954
|
45955
|
45956
|
46518
|
46519
|
46520
|
46521
|
46522
|
46523
|
46524
|
46525
|
46526
|
46527
|
46528
|
46529
|
46530
|
46595
|
46596
|
46597
|
46598
|
46599
|
46600
|
46601
|
46602
|
46603
|
46604
|
46605
|
46606
|
46607
|
46608
|
46609
|
46610
|
46611
|
46612
|
47905
|
47906
|
47907
|
47908
|
47909
|
47910
|
47911
|
47912
|
47913
|
47914
|
47915
|
47916
|
47917
|
47918
|
47919
|
47920
|
47921
|
47922
|
48177
|
48178
|
48179
|
48180
|
48181
|
48182
|
48212
|
48213
|
48214
|
48215
|
48216
|
48217
|
48218
|
50348
|
50349
|
50350
|
50351
|
50352
|
50353
|
50354
|
51527
|
51528
|
51529
|
51530
|
51531
|
51532
|
51533
|
51534
|
51778
|
51779
|
51780
|
51781
|
51782
|
51783
|
52688
|
52689
|
52690
|
52691
|
52692
|
52693
|
55556
|
55557
|
55558
|
55559
|
55560
|
55561
|
55568
|
55569
|
56084
|
56085
|
56086
|
56087
|
56088
|
56089
|
56090
|
56318
|
56319
|
56320
|
56321
|
56322
|
56323
|
56324
|
56325
|
56326
|
56327
|
56328
|
56775
|
56776
|
56777
|
56778
|
56779
|
56780
|
56781
|
56782
|
56783
|
56784
|
56785
|
56816
|
56854
|
56855
|
56856
|
56857
|
56858
|
56859
|
56860
|
56861
|
56862
|
56863
|
56864
|
56865