[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/j... [rel_3_0]
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/j... [rel_3_0] |
|
Date: |
Tue, 19 Sep 2006 07:44:13 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/09/19 07:44:13
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes/javascript: members.js
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryI.tmpl
memberentryP.tmpl
updater : updatedatabase
Log message:
bug fix : modify wrong field name BorrowerMandatoryField
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
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.1&r2=1.11.2.2
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.2&r2=1.9.2.3
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.2&r2=1.6.2.3
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.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.3&r2=1.157.2.4
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js 24 Aug
2006 14:28:58 -0000 1.4.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js 19 Sep
2006 07:44:13 -0000 1.4.2.2
@@ -80,7 +80,6 @@
// function to test all fields in forms and nav in different forms(1 ,2 or 3)
function check_form_borrowers(nav){
-
var statut=0;
if (nav < document.form.step.value) {
document.form.step.value=nav;
@@ -100,11 +99,11 @@
} else {
- if
(document.form.BorrowerMandatoryfield.value==''||document.form.FormFieldList.value==''
)
+ if
(document.form.BorrowerMandatoryField.value==''||document.form.FormFieldList.value==''
)
{}
else
{
- var champ_verif = document.form.BorrowerMandatoryfield.value.split
('|');
+ var champ_verif = document.form.BorrowerMandatoryField.value.split
('|');
var champ_form= document.form.FormFieldList.value.split('|');
var message ="The following fields are mandatory :\n";
var message_champ="";
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.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 25 Aug 2006
14:46:33 -0000 1.11.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 19 Sep 2006
07:44:13 -0000 1.11.2.2
@@ -51,7 +51,7 @@
<!-- TMPL_IF NAME="step_1"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR
NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR
NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -234,7 +234,7 @@
<!-- TMPL_IF NAME="step_2"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR
NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR
NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|B_address|B_zipcode|B_city|phone|phonepro|mobile|email|emailpro|fax">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -460,7 +460,7 @@
<!-- TMPL_IF NAME="step_3"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR
NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR
NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
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.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 25 Aug 2006
15:01:23 -0000 1.9.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 19 Sep 2006
07:44:13 -0000 1.9.2.3
@@ -48,7 +48,7 @@
<!-- TMPL_IF NAME="step_1"-->
<form name="form"
action="/cgi-bin/koha/members/memberentry.pl" method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|title|surname|firstname|dateofbirth|initials|othernames|select_city|sort1|sort2">
<input type="hidden" name="category_type" value="<!--
TMPL_VAR name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -243,7 +243,7 @@
<!-- TMPL_IF NAME="step_2"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|streetnumber|streettype|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|phone|phonepro|mobile|email|emailpro|B_email|B_phone|relationship|fax">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -495,7 +495,7 @@
<!-- TMPL_IF NAME="step_3"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
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.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 25 Aug 2006
15:01:23 -0000 1.6.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 19 Sep 2006
07:44:13 -0000 1.6.2.3
@@ -43,7 +43,7 @@
<!-- TMPL_IF NAME="step_1"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3) -->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|surname|contactname|contactfirstname|select_city">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -151,7 +151,7 @@
<!-- TMPL_IF NAME="step_2"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnotes">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -316,7 +316,7 @@
<!-- TMPL_IF NAME="step_3"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
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.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 25 Aug 2006
15:01:23 -0000 1.7.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 19 Sep 2006
07:44:13 -0000 1.7.2.3
@@ -47,7 +47,7 @@
<!-- TMPL_IF NAME="step_1"--><!--BEGIN OF TEST IF NOT collectivity BUT IN 1
STEP-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -235,7 +235,7 @@
<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnotes">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
@@ -497,7 +497,7 @@
<!-- TMPL_IF NAME="step_3"-->
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3)
-->
- <input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+ <input type="hidden" name="BorrowerMandatoryField"
value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
<input type="hidden" name="FormFieldList"
value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.157.2.3
retrieving revision 1.157.2.4
diff -u -b -r1.157.2.3 -r1.157.2.4
--- updater/updatedatabase 18 Sep 2006 14:00:24 -0000 1.157.2.3
+++ updater/updatedatabase 19 Sep 2006 07:44:13 -0000 1.157.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.157.2.3 2006/09/18 14:00:24 btoumi Exp $
+# $Id: updatedatabase,v 1.157.2.4 2006/09/19 07:44:13 btoumi Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -233,7 +233,7 @@
},
{
uniquefieldrequired => 'variable',
- variable => 'borrowerMandatoryField',
+ variable => 'BorrowerMandatoryField',
value => 'zipcode|surname',
forceupdate => { 'explanation' => 1,
'type' => 1},
@@ -1678,6 +1678,9 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.157.2.4 2006/09/19 07:44:13 btoumi
+# bug fix : modify wrong field name BorrowerMandatoryField
+#
# Revision 1.157.2.3 2006/09/18 14:00:24 btoumi
# bug fix :wrond field name for opacnote and contactnote
#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/j... [rel_3_0],
Bruno Toumi <=