From 070b87d88f7f74481b4c75b1242ba9a3b68b5c9f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 19 Jul 2018 15:13:55 +0000 Subject: [PATCH] Bug 20828: Step 4 of moremember is used for Housebound and additional attributes This patch modifies the patron edit process so that "Housebound roles" can be edited as a separate step. To test, apply the patch and open an existing patron's detail page (moremember.tt). Test the "edit" links for 'Housebound roles' and 'Additional attributes and identifiers' and confirm that each opens its own edit page, and saving changes works correctly. --- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- members/memberentry.pl | 8 ++++---- 3 files changed, 10 insertions(+), 7 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 3635360..35bc823 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -147,7 +147,7 @@ [% ELSE %] -[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 %] +[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %] [%# Only put the cardnumber if we arent showing it in the form later %] [% IF cardnumber %] @@ -976,7 +976,7 @@ [% END %] -[% IF ( step_4 ) %] +[% IF ( step_7 ) %] [% IF Koha.Preference('HouseboundModule') %]
Housebound roles @@ -1026,6 +1026,9 @@
[% END # hide fieldset %] +[% END # IF step_7 %] + +[% IF ( step_4 ) %] [% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
Additional attributes and identifiers diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index cac919f..605ac75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -302,7 +302,7 @@
- Edit + Edit
[% END %] diff --git a/members/memberentry.pl b/members/memberentry.pl index e5090b2..26f1fa6 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -569,7 +569,7 @@ if ($nok or !$nodouble){ %data=%newdata; $template->param( updtype => ($op eq 'add' ?'I':'M')); # used to check for $op eq "insert"... but we just changed $op! unless ($step){ - $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1); + $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 ); } } if (C4::Context->preference("IndependentBranches")) { @@ -582,11 +582,11 @@ if (C4::Context->preference("IndependentBranches")) { } } if ($op eq 'add'){ - $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1); + $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1); } if ($op eq "modify") { $template->param( updtype => 'M',modify => 1 ); - $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step; + $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1) unless $step; if ( $step == 4 ) { $template->param( categorycode => $borrower_data->{'categorycode'} ); } @@ -602,7 +602,7 @@ if ($op eq "modify") { } if ( $op eq "duplicate" ) { $template->param( updtype => 'I' ); - $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step; + $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 ) unless $step; $data{'cardnumber'} = ""; } -- 2.1.4