[Koha-cvs] CVS: koha/members deletemem.pl,1.4,1.5 memberentry.pl,1.13,1.14
Henri-Damien LAURENT
hdl at users.sourceforge.net
Fri Jul 29 18:12:56 CEST 2005
Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30030/members
Modified Files:
deletemem.pl memberentry.pl
Log Message:
Fixing bug in deletemem.pl :
flags verification was not good.
Adding branch Independancy management.
In memberentry.pl and deletemem.pl
Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/deletemem.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** deletemem.pl 27 Oct 2004 15:33:55 -0000 1.4
--- deletemem.pl 29 Jul 2005 16:12:53 -0000 1.5
***************
*** 39,43 ****
my $flagsrequired;
! $flagsrequired->{borrower}=1;
my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
--- 39,43 ----
my $flagsrequired;
! $flagsrequired->{borrowers}=1;
my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
***************
*** 56,59 ****
--- 56,71 ----
}
my ($bor,$flags)=getpatroninformation(\%env, $member,'');
+
+ if (C4::Context->preference("IndependantBranches")) {
+ my $userenv = C4::Context->userenv;
+ unless ($userenv->{flags} == 1){
+ unless ($userenv->{'branch'} eq $bor->{'branchcode'}){
+ warn "user ".$userenv->{'branch'} ."borrower :". $bor->{'branchcode'};
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
+ exit 1;
+ }
+ }
+ }
+
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Select * from borrowers where guarantor=?");
Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** memberentry.pl 29 Jul 2005 08:33:48 -0000 1.13
--- memberentry.pl 29 Jul 2005 16:12:54 -0000 1.14
***************
*** 91,94 ****
--- 91,95 ----
}
}
+
if ($data{'sex'} eq '' && $categorycode ne "I"){
push @errors, "ERROR_gender";
***************
*** 111,114 ****
--- 112,124 ----
$nok=1;
}
+ if (C4::Context->preference("IndependantBranches")) {
+ my $userenv = C4::Context->userenv;
+ if ($userenv->{flags} == 1){
+ unless ($userenv->{branch} eq $data{'branchcode'}){
+ push @errors, "ERROR_branch";
+ $nok=1;
+ }
+ }
+ }
if ($nok) {
foreach my $error (@errors) {
***************
*** 134,138 ****
}
if ($delete){
! print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
} else { # this else goes down the whole script
if ($actionType eq 'Add'){
--- 144,166 ----
}
if ($delete){
! my @errors;
! my $nok;
! my $branch =$input->param('branchcode');
! if (C4::Context->preference("IndependantBranches")) {
! my $userenv = C4::Context->userenv;
! if ($userenv->{flags} == 1){
! if ($userenv->{branch} eq $branch){
! print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
! } else {
! push @errors, "ERROR_branch";
! $nok=1;
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
! }
! } else {
! print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
! }
! } else {
! print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
! }
} else { # this else goes down the whole script
if ($actionType eq 'Add'){
***************
*** 151,154 ****
--- 179,192 ----
$data=borrdata('',$borrowernumber);
}
+ if (C4::Context->preference("IndependantBranches")) {
+ my $userenv = C4::Context->userenv;
+ unless ($userenv->{flags} == 1){
+ warn "userenv=".$userenv->{'branch'}." member branch :".$data->{'branchcode'};
+ unless ($userenv->{'branch'} eq $data->{'branchcode'}){
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+ exit 1;
+ }
+ }
+ }
if ($actionType eq 'Add'){
$template->param( updtype => 'I');
More information about the Koha-cvs
mailing list