[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: |
Tue, 13 Jun 2006 15:25:17 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Bruno Toumi <btoumi> 06/06/13 15:25:17
Modified files:
koha-tmpl/intranet-tmpl/prog/en/members: memberentryC.tmpl
moremember.tmpl
members : memberentry.pl
Log message:
memberentryC.tmpl: modify and add conditions
moremember.tmpl:add op value in url (modify)
memberentry.pl:modify condition
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.31&r2=1.32
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 12 Jun 2006
13:00:40 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 13 Jun 2006
15:25:17 -0000 1.7
@@ -5,7 +5,7 @@
<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
- <!-- TMPL_IF NAME="opadd" -->
+ <!-- TMPL_IF NAME="add" -->
<h1>
Add children member (step <!-- TMPL_VAR NAME="step" -->)
</h1>
@@ -179,8 +179,11 @@
Other name</label>
<input style="text-transform:uppercase;" type="text"
name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" >
</p>
- <p><a
href="javascript:Dopopguarantor('guarantor_search.pl');">Find guarantor</a>
- </p>
+
+ <!-- TMPL_UNLESS name="guarantorid"-->
+ <p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Find
guarantor</a></p>
+ <!-- /TMPL_UNLESS -->
+
</fieldset>
<fieldset id="memberentry_identity">
<legend>Borrower type</legend>
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 7 Jun 2006
14:55:37 -0000 1.10
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 13 Jun 2006
15:25:17 -0000 1.11
@@ -9,7 +9,7 @@
<!-- TMPL_UNLESS name="guarantorborrowernumber" -->
<a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=C">Add child</a>
<!-- /TMPL_UNLESS -->
- <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--
TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
Edit this Record
</a>
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- members/memberentry.pl 13 Jun 2006 09:19:18 -0000 1.31
+++ members/memberentry.pl 13 Jun 2006 15:25:17 -0000 1.32
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.31 2006/06/13 09:19:18 btoumi Exp $
+# $Id: memberentry.pl,v 1.32 2006/06/13 15:25:17 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -116,7 +116,7 @@
#recover all data from guarantor address phone ,fax...
-if ($category_type eq 'C' and $guarantorid ne '' and $data{'contactname'} eq
''){
+if ($category_type eq 'C' and $guarantorid ne '' ){
my $guarantordata=getguarantordata($guarantorid);
if (($data{'contactname'} eq '' or $data{'contactname'}
ne $guarantordata->{'surname'})) {
$data{'contactfirstname'}=$guarantordata->{'firstname'};
@@ -134,6 +134,7 @@
$data{'fax'}=$guarantordata->{'fax'};
$data{'email'}=$guarantordata->{'email'};
$data{'emailpro'}=$guarantordata->{'emailpro'};
+
$default_city=getidcity($data{'city'});
}
}
@@ -284,9 +285,8 @@
-default=>$default_category,
-labels=>$labels);
#test in city
-
- if ($op eq ''){
- (my $selectcity=&getidcity($data{'city'})) if ($select_city eq '');
+ if ($op eq 'modify' and $select_city eq '' ){
+ my $selectcity=&getidcity($data{'city'});
$default_city=$selectcity;
}
my($cityid,$name_city)=getcities();
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/membersmem...,
Bruno Toumi <=