Attachment 77483 Details for Bug 20828 – Bug 20828: Step 4 of moremember is used for Housebound and additional attributes

[patch] Bug 20828: Step 4 of moremember is used for Housebound and additional attributes

Bug-20828-Step-4-of-moremember-is-used-for-Housebo.patch (text/plain), 4.93 KB, created by Jonathan Druart on 2018-08-03 18:20:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-08-03 18:20:10 UTC

Size: 4.93 KB

patch

obsolete

>From 93d6bf2da1020aced1d10b00b7c607b31f54fd90 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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.
>
>Signed-off-by: Cab Vinton <bibliwho@gmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> 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 36353607b3..35bc823c75 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 @@
> <input type="hidden" name="op" value="insert" />
> [% ELSE %]
> <input type="hidden" name="op" value="save" />
>-[% 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 %]
> <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
>@@ -976,7 +976,7 @@
> 
> [% END %]
> 
>-[% IF ( step_4 ) %]
>+[% IF ( step_7 ) %]
> [% IF Koha.Preference('HouseboundModule') %]
>   <fieldset class="rows" id="memberentry_housebound_roles">
>     <legend id="housebound_roles">Housebound roles</legend>
>@@ -1026,6 +1026,9 @@
>     </ol>
>   </fieldset>
> [% END # hide fieldset %]
>+[% END # IF step_7 %]
>+
>+[% IF ( step_4 ) %]
> [% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
>   <fieldset class="rows" id="memberentry_patron_attributes">
>     <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
>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 cac919f1dd..605ac75c56 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 @@
>                                     </div>
>                                 </div>
>                                 <div class="action">
>-                                    <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a>
>+                                    <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=7">Edit</a>
>                                 </div>
>                             [% END %]
> 
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 0b05bb1682..3618c4ffbe 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -573,7 +573,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")) {
>@@ -586,11 +586,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'} );
>     }
>@@ -606,7 +606,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.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20828: 77139 | 77466 | 77483