From af2bfefd32604c39427a9f53c9d3ced4f332e3c4 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Tue, 16 Oct 2007 16:02:32 -0500 Subject: [PATCH] Bug Fixing : userid was blanked out in partial edit. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- members/memberentry.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 72e0281296..3332a58ea5 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -101,10 +101,10 @@ $category_type="A" unless $category_type; # FIXME we should display a error mess my %newdata; if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') { - my @names= $borrower_data && $op ne 'save' ? keys %$borrower_data : $input->param(); + my @names= ($borrower_data && $op ne 'save') ? keys %$borrower_data : $input->param(); foreach my $key (@names) { - $newdata{$key} = $input->param($key) || ''; - $newdata{$key} =~ s/\"/"/gg unless $key eq 'borrowernotes' or $key eq 'opacnote'; + $newdata{$key} = $input->param($key) if ($input->param($key)); + $newdata{$key} =~ s/\"/"/gg unless ($key eq 'borrowernotes' or $key eq 'opacnote'); } $newdata{'dateenrolled'}=format_date_in_iso($newdata{'dateenrolled'}) if ($newdata{dateenrolled}); $newdata{'dateexpiry'}=format_date_in_iso($newdata{'dateexpiry'}) if ($newdata{dateexpiry}); @@ -170,7 +170,7 @@ if ($op eq 'save' || $op eq 'insert'){ my $userenv = C4::Context->userenv; if ($userenv && $userenv->{flags} != 1){ warn " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch}; - unless ($userenv->{branch} eq $newdata{'branchcode'}){ + unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){ push @errors, "ERROR_branch"; $nok=1; } -- 2.39.2