[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/circ/circu... [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/10/11 10:00:08

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

Log message:
	Set the member's category_type when editing a member from circulation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.2&r2=1.38.2.3

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl	19 Sep 2006 22:30:37 -0000	1.6.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl	11 Oct 2006 10:00:08 -0000	1.6.2.3
@@ -197,7 +197,7 @@
     <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
     <li>
       (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
-        / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)
+        / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a>)
     </li>
   </ul>
     <!-- TMPL_IF NAME="flagged" -->

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -b -r1.38.2.2 -r1.38.2.3
--- members/memberentry.pl	25 Sep 2006 14:33:49 -0000	1.38.2.2
+++ members/memberentry.pl	11 Oct 2006 10:00:08 -0000	1.38.2.3
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.2 2006/09/25 14:33:49 btoumi Exp $
+# $Id: memberentry.pl,v 1.38.2.3 2006/10/11 10:00:08 toins Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -43,10 +43,14 @@
 my $input = new CGI;
 my %data;
 
-
 my $dbh = C4::Context->dbh;
 
-my $category_type = $input->param('category_type') || die "NO CATEGORY_TYPE !"; # A, E, C, or P
+my $categorycode=$input->param('categorycode');
+my $category_type = $input->param('category_type');
+my ($category_type,$desc) = getcategorytype($categorycode) unless ($category_type && !($categorycode));
+
+die unless $category_type; # FIXME we should display a error message instead of a 500 error !
+
 my $step=$input->param('step') || 0;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/memberentry$category_type.tmpl",
@@ -62,7 +66,6 @@
 my $modify=$input->param('modify');
 my $delete=$input->param('delete');
 my $op=$input->param('op');
-my $categorycode=$input->param('categorycode');
 my $destination=$input->param('destination');
 my $cardnumber=$input->param('cardnumber');
 my $check_member=$input->param('check_member');