Bug 3202: creating new 'child' categorytype patrons doesn't set branch properly
authorIan Walls <ian.walls@bywatersolutions.com>
Thu, 21 Apr 2011 04:46:34 +0000 (00:46 -0400)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 26 Apr 2011 08:37:07 +0000 (20:37 +1200)
If a guarantor search is not being performed, the creation of any Child category_type patron will
not default to the currently logged in branch, but rather the first branch alphabetically.

Adding a test for the existence of any guarantor branch data before assigning it clears up this problem

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
members/memberentry.pl

index c665b6e..a8e764c 100755 (executable)
@@ -549,7 +549,7 @@ if(scalar(@select_branch) > 0){
 # --------------------------------------------------------------------------------------------------------
   #in modify mod :default value from $CGIbranch comes from borrowers table
   #in add mod: default value come from branches table (ip correspendence)
-$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C'));
+$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C' && $data{'branchcode'}));
 $CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
             -name   => 'branchcode',
             -values => \@select_branch,