[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/membersmem...
From: |
Bruno Toumi |
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/membersmem... |
Date: |
Wed, 14 Jun 2006 15:59:38 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Bruno Toumi <btoumi> 06/06/14 15:59:38
Modified files:
koha-tmpl/intranet-tmpl/prog/en/members: memberentryC.tmpl
members : memberentry.pl
Log message:
memberentryC.tmpl:add test to modify link name
memberentry.pl:add test to return default value for select_city
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.32&r2=1.33
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 13 Jun 2006
15:25:17 -0000 1.7
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 14 Jun 2006
15:59:37 -0000 1.8
@@ -180,10 +180,14 @@
<input style="text-transform:uppercase;" type="text"
name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" >
</p>
- <!-- TMPL_UNLESS name="guarantorid"-->
+ <!-- TMPL_UNLESS NAME="add"-->
+ <p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Modify
guarantor</a></p>
+ <!-- /TMPL_UNLESS -->
+ <!-- TMPL_IF NAME="add" -->
+ <!-- TMPL_UNLESS NAME="guarantorid"-->
<p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Find
guarantor</a></p>
<!-- /TMPL_UNLESS -->
-
+ <!-- /TMPL_IF -->
</fieldset>
<fieldset id="memberentry_identity">
<legend>Borrower type</legend>
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- members/memberentry.pl 13 Jun 2006 15:25:17 -0000 1.32
+++ members/memberentry.pl 14 Jun 2006 15:59:38 -0000 1.33
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.32 2006/06/13 15:25:17 btoumi Exp $
+# $Id: memberentry.pl,v 1.33 2006/06/14 15:59:38 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -85,6 +85,7 @@
$template->param( "mandatory$_" => 1);
}
+$template->param("add"=>1) if ($op eq 'add');
$template->param( "checked" => 1) if ($nodouble eq 1);
my $borrower_data=borrdata('',$borrowernumber);
@@ -94,7 +95,6 @@
$data{$column}=$borrower_data->{$column};
}
}
-
if ($op eq 'add' or $op eq 'modify') {
my @names=$input->param;
foreach my $key (@names){
@@ -134,10 +134,8 @@
$data{'fax'}=$guarantordata->{'fax'};
$data{'email'}=$guarantordata->{'email'};
$data{'emailpro'}=$guarantordata->{'emailpro'};
-
- $default_city=getidcity($data{'city'});
- }
}
+}
# CHECKS step by step
# STEP 1
@@ -158,6 +156,7 @@
$nok = 1;
}
}
+
}
# STEP 2
if ($step eq 2) {
@@ -285,7 +284,9 @@
-default=>$default_category,
-labels=>$labels);
#test in city
- if ($op eq 'modify' and $select_city eq '' ){
+ $select_city=getidcity($data{'city'}) if ($guarantorid ne '');
+ ($default_city=$select_city) if ($step eq 0);
+ if ($select_city eq '' ){
my $selectcity=&getidcity($data{'city'});
$default_city=$selectcity;
}