From 0e15d8cd53ce234388af9f09b7c8ef8c3663cb0b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 16 May 2019 09:42:32 -0500 Subject: [PATCH] Bug 22928: (bug 20226 follow-up) Fix display of 'Update child to adult' link Looks like it is caused by bug 20226, however I am pretty sure it works when I wrote the patch. [% IF Categories.scalar.all(category_type => 'A').count > 0 %] is always wrong. It must be, either: [% IF Categories.all(category_type => 'A').size > 0 %] or [% SET adult_categories = Categories.scalar.all(category_type => 'A') %] [% IF adult_categories.count > 0 %] In the first case we are getting an array whereas in the later, a Koha::Patrons which is preferable. Test plan (from 20226): - Remove all your adult categories (categories.category_type='A') - Create a patron with a child category - Try to update to adult category => The entry does no longer appears! (This is a change in the behaviour) - Create one adult category - Update to adult category => There is a JS confirmation message, if you accept the patron will be updated to the adult category - Create (at least) another adult category - Create another child - Update to adult category => No more confirmation message but a popup to select the adult category - Pick one => The patron has been updated to the adult category Signed-off-by: Liz Rea Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index a86c976846..1ab510c5b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -75,7 +75,8 @@ [% ELSE %]
  • Delete
  • [% END %] - [% IF Categories.scalar.all(category_type => 'A').count > 0 %] + [% SET adult_categories = Categories.scalar.all(category_type => 'A') %] + [% IF adult_categories.count > 0 %] [% IF patron.is_child %]
  • Update child to adult patron
  • [% ELSE %] -- 2.20.1 (Apple Git-117)