[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0] |
|
Date: |
Fri, 13 Oct 2006 08:45:24 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/10/13 08:45:24
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryI.tmpl
memberentryP.tmpl
Log message:
bug fix : loose flags when modify borrowers
remove all flags field in members template
remove update and insert in flags field
(because the flags are setup in other part)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.7&r2=1.32.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.4&r2=1.11.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.5&r2=1.9.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.5&r2=1.6.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.5&r2=1.7.2.6
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.7
retrieving revision 1.32.2.8
diff -u -b -r1.32.2.7 -r1.32.2.8
--- C4/Members.pm 12 Oct 2006 13:41:47 -0000 1.32.2.7
+++ C4/Members.pm 13 Oct 2006 08:45:24 -0000 1.32.2.8
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.7 2006/10/12 13:41:47 btoumi Exp $
+# $Id: Members.pm,v 1.32.2.8 2006/10/13 08:45:24 btoumi Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.7 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.8 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -350,7 +350,7 @@
B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email
= ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress
= ?,lost = ?,debarred = ?,contactname = ?,
contactfirstname = ?,contacttitle = ?,guarantorid =
?,borrowernotes = ?,relationship = ?,ethnicity = ?,
- ethnotes = ?,sex = ?,flags = ?,userid = ?,opacnote =
?,contactnote = ?,sort1 = ?,sort2 = ?
+ ethnotes = ?,sex = ?,userid = ?,opacnote = ?,contactnote =
?,sort1 = ?,sort2 = ?
WHERE borrowernumber=$data{'borrowernumber'}";
$sth=$dbh->prepare($query);
$sth->execute(
@@ -375,7 +375,7 @@
$data{'borrowernotes'},$data{'relationship'},
$data{'ethnicity'},$data{'ethnotes'},
$data{'sex'},
- $data{'flags'},$data{'userid'},
+ $data{'userid'},
$data{'opacnote'},$data{'contactnote'},
$data{'sort1'},$data{'sort2'});
}
@@ -389,7 +389,7 @@
B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email
= ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress
= ?,lost = ?,debarred = ?,contactname = ?,
contactfirstname = ?,contacttitle = ?,guarantorid =
?,borrowernotes = ?,relationship = ?,ethnicity = ?,
- ethnotes = ?,sex = ?,password = ?,flags = ?,userid = ?,opacnote
= ?,contactnote = ?,sort1 = ?,sort2 = ?
+ ethnotes = ?,sex = ?,password = ?,userid = ?,opacnote =
?,contactnote = ?,sort1 = ?,sort2 = ?
WHERE borrowernumber=$data{'borrowernumber'}";
$sth=$dbh->prepare($query);
$sth->execute(
@@ -414,7 +414,7 @@
$data{'borrowernotes'},$data{'relationship'},
$data{'ethnicity'},$data{'ethnotes'},
$data{'sex'},$data{'password'},
- $data{'flags'},$data{'userid'},
+ $data{'userid'},
$data{'opacnote'},$data{'contactnote'},
$data{'sort1'},$data{'sort2'}
);
@@ -523,8 +523,6 @@
. $dbh->quote( $data{'sex'} )
. ",fax="
. $dbh->quote( $data{'fax'} )
- . ",flags="
- . $dbh->quote( $data{'flags'} )
. ",relationship="
. $dbh->quote( $data{'relationship'} )
. ",B_streetnumber="
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -b -r1.11.2.4 -r1.11.2.5
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 13 Oct 2006
08:04:35 -0000 1.11.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 13 Oct 2006
08:45:24 -0000 1.11.2.5
@@ -59,7 +59,6 @@
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR
NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags"
-->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
@@ -242,7 +241,6 @@
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR
NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags"
-->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
@@ -468,7 +466,6 @@
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR
NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags"
-->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
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.9.2.5
retrieving revision 1.9.2.6
diff -u -b -r1.9.2.5 -r1.9.2.6
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 13 Oct 2006
08:04:35 -0000 1.9.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 13 Oct 2006
08:45:24 -0000 1.9.2.6
@@ -57,7 +57,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!--
TMPL_VAR NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!--
TMPL_VAR NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!--
TMPL_VAR NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" " value="<!--
TMPL_VAR NAME="nodouble" -->"/>
@@ -252,7 +251,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" " value="<!-- TMPL_VAR
NAME="nodouble" -->"/>
@@ -504,7 +502,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" " value="<!-- TMPL_VAR
NAME="nodouble" -->"/>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -b -r1.6.2.5 -r1.6.2.6
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 13 Oct 2006
08:04:35 -0000 1.6.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 13 Oct 2006
08:45:24 -0000 1.6.2.6
@@ -52,7 +52,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
@@ -160,7 +159,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
@@ -325,7 +323,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->"/>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -b -r1.7.2.5 -r1.7.2.6
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 13 Oct 2006
08:04:35 -0000 1.7.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 13 Oct 2006
08:45:24 -0000 1.7.2.6
@@ -56,7 +56,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" >
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->"/>
@@ -244,7 +243,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
@@ -506,7 +504,6 @@
<input type="hidden" name="select_roadtype" value="<!--
TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR
NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR
NAME="check_member" -->" />
- <input type="hidden" name="flags" value="<!-- TMPL_VAR
NAME="flags" -->" />
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
NAME="borrowernumber" -->">
<input type="hidden" name="nodouble" value="<!-- TMPL_VAR
NAME="nodouble" -->" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0],
Bruno Toumi <=