From deb89089d17b166c3575515d6228de1c80c2304b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 24 Sep 2014 12:02:42 -0400 Subject: [PATCH] Bug 7878 - When duplicating a patron too many fields carrying over When duplicating a patron the resulting entry form contains the data from the original patron in the following fields: Other names, Initials, Gender, OPAC note, Staff note, and expiration date. These should be blank for a new duplicated patron. This patch corrects this. To test, locate or create a patron record which contains data in the fields listed above. Duplicate that patron and confirm that those fields are blank in the resulting patron entry form. Confirm also that editing an existing patron with data in those fields works correctly. Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- .../prog/en/modules/members/memberentrygen.tt | 51 ++++++++++++---------- 1 file changed, 29 insertions(+), 22 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 56cc570..41dbdd6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -316,7 +316,7 @@ - + [% IF ( mandatoryinitials ) %]Required[% END %] [% END %] @@ -329,7 +329,7 @@ - + [% IF ( mandatoryothernames ) %]Required[% END %] [% IF ( I ) %][% END %] @@ -337,22 +337,29 @@ [% UNLESS ( I ) %] [% UNLESS nosex %]
  • - - [% IF ( female ) %] - -[% ELSE %] - -[% END %] - [% IF ( male ) %] - -[% ELSE %] - -[% END %] -[% IF ( none ) %] - -[% ELSE %] - -[% END %] + + [% UNLESS ( opduplicate ) %] + [% IF ( female ) %] + + [% ELSE %] + + [% END %] + [% IF ( male ) %] + + [% ELSE %] + + [% END %] + [% IF ( none ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + + + + [% END %] +
  • [% END %] [% END %] @@ -1009,13 +1016,13 @@ Expiry date (leave blank for auto calc) [% IF ( dateformat == "metric" ) %] [% UNLESS ( opadd ) %] - + [% ELSE %] [% END %] [% ELSE %] [% UNLESS ( opadd ) %] - + [% ELSE %] [% END %] @@ -1032,7 +1039,7 @@ - +
    This message appears on this patron's user page in the OPAC
    [% IF ( mandatoryopacnote ) %]Required[% END %] @@ -1045,7 +1052,7 @@ - +
    This message displays when checking out to this patron
    [% IF ( mandatoryborrowernotes ) %]Required[% END %] -- 2.1.0