Bugzilla – Attachment 74653 Details for
Bug 9302
Add ability to merge patron records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9302: Add error message if keeper patron is invalid
Bug-9302-Add-error-message-if-keeper-patron-is-inv.patch (text/plain), 2.91 KB, created by
Kyle M Hall
on 2018-04-20 15:48:05 UTC
(
hide
)
Description:
Bug 9302: Add error message if keeper patron is invalid
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2018-04-20 15:48:05 UTC
Size:
2.91 KB
patch
obsolete
>From 369f119c750a77e55bb637dccde8a8601f5d24e2 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 20 Apr 2018 15:47:51 +0000 >Subject: [PATCH] Bug 9302: Add error message if keeper patron is invalid > >--- > .../prog/en/modules/members/merge-patrons.tt | 10 +++++++-- > members/merge-patrons.pl | 25 +++++++++++++--------- > 2 files changed, 23 insertions(+), 12 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index a8cd953978..264d1c6728 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -95,7 +95,11 @@ > [% ELSIF action == 'merge' %] > <h4>Results</h4> > [% IF error %] >- <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div> >+ [% IF error == 'INVALID_KEEPER' %] >+ <div class="dialog alert">Merge failed! The patron to keep was invalid.</div> >+ [% ELSE %] >+ <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div> >+ [% END %] > [% ELSIF !results.merged.keys.size %] > <div class="dialog alert">No valid patrons to merge were found.</div> > [% ELSE %] >@@ -123,7 +127,9 @@ > [% END %] > [% END %] > >- <a class="btn btn-default btn-sm" href="moremember.pl?borrowernumber=[% keeper.id %]">View patron record</a> >+ [% UNLESS error %] >+ <a class="btn btn-default btn-sm" href="moremember.pl?borrowernumber=[% keeper.id %]">View patron record</a> >+ [% END %] > [% END %] > </div> > </div> >diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl >index b55db88bb6..b4ea721a10 100755 >--- a/members/merge-patrons.pl >+++ b/members/merge-patrons.pl >@@ -48,16 +48,21 @@ if ( $action eq 'show' ) { > my $keeper_id = $cgi->param('keeper'); > my $results; > >- try { >- my $keeper = Koha::Patrons->find( $keeper_id ); >- $results = $keeper->merge_with( \@ids ); >- $template->param( >- keeper => $keeper, >- results => $results >- ); >- } >- catch { >- $template->param( error => $_ ); >+ my $keeper = Koha::Patrons->find( $keeper_id ); >+ >+ if ( $keeper ) { >+ try { >+ $results = $keeper->merge_with( \@ids ); >+ $template->param( >+ keeper => $keeper, >+ results => $results >+ ); >+ } >+ catch { >+ $template->param( error => $_ ); >+ } >+ } else { >+ $template->param( error => 'INVALID_KEEPER' ); > } > } > >-- >2.15.1 (Apple Git-101)
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 9302
:
66615
|
66617
|
68606
|
70474
|
70477
|
70478
|
70479
|
70482
|
70483
|
72082
|
72083
|
73645
|
73646
|
73647
|
73648
|
73649
|
73660
|
73661
|
73662
|
73663
|
73664
|
73668
|
73679
|
74439
|
74440
|
74441
|
74442
|
74443
|
74444
|
74445
|
74446
|
74447
|
74448
|
74449
|
74450
|
74451
|
74585
| 74653