[Koha-cvs] koha members/memberentry.pl koha-tmpl/intranet-...

[Chris Cormack]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	
Changes by:	Chris Cormack <rangi at savannah.gnu.org>	06/05/23 02:18:22

Modified files:
	members        : memberentry.pl 
	koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl 

Log message:
	Should be the last of the changes to these files
	
	Have to build a table to store borrower->organisation (which are really just other borrowers) links and write a routine to populate that table.
	
	May have to make another change to memberentry.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/members/memberentry.pl.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:1.4 koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:1.5
--- koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:1.4	Tue May 23 00:57:18 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl	Tue May 23 02:18:21 2006
@@ -505,6 +505,7 @@
 	<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 
 	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
 	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+	<input type="hidden" name="organisations" value="<!-- TMPL_VAR NAME="organisations" -->" >	
 	<!-- TMPL_IF NAME="opadd" -->
 		<input type="hidden" name="op" value="add">
 	<!-- TMPL_ELSE -->
Index: koha/members/memberentry.pl
diff -u koha/members/memberentry.pl:1.21 koha/members/memberentry.pl:1.22
--- koha/members/memberentry.pl:1.21	Tue May 23 00:46:32 2006
+++ koha/members/memberentry.pl	Tue May 23 02:18:21 2006
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.21 2006/05/23 00:46:32 rangi Exp $
+# $Id: memberentry.pl,v 1.22 2006/05/23 02:18:21 rangi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -204,6 +204,10 @@
 				$nok=1;
 			} else {
 				$borrowerid = &newmember(%data);
+			        if ($data{'organisations'}){
+				    # need to add the members organisations
+				    add_member_orgs($borrowerid,$data{'organisations'});
+				 }
 				logaction($loggedinuser,"MEMBERS","add member", $borrowerid, "");
 			}
  		}
@@ -393,19 +397,21 @@
        if (C4::Context->preference("memberofinstitution")){
 	   my $organisations=get_institutions();
 	   my @orgs;
-	   my %orgs;
+	   my %org_labels;
 	   foreach my $organisation (keys %$organisations) {
 	       push @orgs,$organisation;
-	       $orgs{$organisation}=$organisations->{$organisation}->{'surname'};
+	       $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
 	   }
-	       
 	   $member_of_institution=1;
 	   
-	   $CGIorganisations = CGI::scrolling_list( -name=>'organisations',
-	       -values=>\@orgs,
-	       -size=>5,
-	       -multiple=>'true'
-	       -labels=>\%orgs,
+	   $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
+	       -name     => 'organisations',
+	       -labels   => \%org_labels,
+	       -values   => \@orgs,
+	       -size     => 5,
+	       -multiple => 'true'
+
+	       
 	   );
        }
 
@@ -506,6 +512,7 @@
 		citypopup	=> $citypopup,
 		roadpopup	=> $roadpopup,	
 		contacttype	=> $data{'contacttype'},
+	        organisations   => $data{'organisations'},
 		flagloop	=> \@flagdata,
 # 				"contacttype_".$data{'contacttype'} =>" SELECTED ",
 		dateformat      => display_date_format(),