From 4960415c09bee0d796e3b5c59fb2165b5f10c25d Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Tue, 9 Jul 2013 11:18:49 +0100 Subject: [PATCH] Bug 10507 Fix namespace collision in patron entry If a warning about a duplicated patron attribute is returned the value was being passed back for display in the warning message with the same name as the variable in errors as the message is displayed in the context of errors the error value 1 was being displayed not the value duplicated as intended. Pass the value to the template with a unique name --- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- members/memberentry.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 1bb8e3e..a57c03d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -176,7 +176,7 @@ [% END %] [% IF ( ERROR_extended_unique_id_failed ) %]
  • The attribute value - [% ERROR_extended_unique_id_failed %] is already is use by another patron record.
  • + [% ERROR_extended_unique_id_failed_value %] is already is use by another patron record. [% END %] diff --git a/members/memberentry.pl b/members/memberentry.pl index b7123f2..0bf3122 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -315,7 +315,7 @@ if ($op eq 'save' || $op eq 'insert'){ foreach my $attr (@$extended_patron_attributes) { unless (C4::Members::Attributes::CheckUniqueness($attr->{code}, $attr->{value}, $borrowernumber)) { push @errors, "ERROR_extended_unique_id_failed"; - $template->param(ERROR_extended_unique_id_failed => "$attr->{code}/$attr->{value}"); + $template->param(ERROR_extended_unique_id_failed_value => "$attr->{code}/$attr->{value}"); } } } -- 1.8.3.2.634.g7a3187e