[Koha-cvs] koha admin/systempreferences.pl koha-tmpl/intra...
Chris Cormack
crc at liblime.com
Mon Jul 2 04:30:17 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: Chris Cormack <rangi> 07/07/02 02:30:17
Modified files:
admin : systempreferences.pl
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryP.tmpl
koha-tmpl/intranet-tmpl/prog/fr/members: memberentryA.tmpl
members : memberentry.pl
updater : updatedatabase
Log message:
Fix for bug 1296, making surnames uppercase a systems preference
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&r1=1.170&r2=1.171
Patches:
Index: admin/systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- admin/systempreferences.pl 4 May 2007 16:24:08 -0000 1.40
+++ admin/systempreferences.pl 2 Jul 2007 02:30:15 -0000 1.41
@@ -127,6 +127,7 @@
$tabsysprefs{BorrowersTitles}="Members";
$tabsysprefs{patronimages}="Members";
$tabsysprefs{MinPasswordLength}="Members";
+ $tabsysprefs{uppercasesurnames}="Members";
# OPAC
$tabsysprefs{AmazonAssocTag}="OPAC";
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 16 Mar 2007 01:25:09 -0000 1.18
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 2 Jul 2007 02:30:15 -0000 1.19
@@ -138,7 +138,11 @@
<label>
<!-- /TMPL_IF-->
Surname</label>
+ <! --TMPL_IF NAME="uppercasesurnames" -->
<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- TMPL_ELSE -->
+ <input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- /TMPL_IF -->
</p>
<p>
<!-- TMPL_IF NAME="mandatoryfirstname" -->
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 27 Jun 2007 13:01:38 -0000 1.18
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 2 Jul 2007 02:30:16 -0000 1.19
@@ -137,7 +137,11 @@
<label>
<!-- /TMPL_IF-->
Surname</label>
+ <! --TMPL_IF NAME="uppercasesurnames" -->
<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- TMPL_ELSE -->
+ <input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- /TMPL_IF -->
</p>
<p>
<!-- TMPL_IF NAME="mandatoryfirstname" -->
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 16 Mar 2007 01:25:09 -0000 1.14
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 2 Jul 2007 02:30:16 -0000 1.15
@@ -132,7 +132,11 @@
<label>
<!-- /TMPL_IF-->
Surname</label>
+ <! --TMPL_IF NAME="uppercasesurnames" -->
<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- TMPL_ELSE -->
+ <input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- /TMPL_IF -->
</p>
<p>
<!-- TMPL_IF NAME="mandatoryfirstname" -->
Index: koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl 23 May 2007 09:55:39 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl 2 Jul 2007 02:30:16 -0000 1.2
@@ -132,7 +132,14 @@
<label>
<!-- /TMPL_IF-->
Nom de famille</label>
+ <! --TMPL_IF NAME="uppercasesurnames" -->
<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- TMPL_ELSE -->
+ <input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
+ <!-- /TMPL_IF -->
+
+
+
</p>
<p>
<!-- TMPL_IF NAME="mandatoryfirstname" -->
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- members/memberentry.pl 30 May 2007 08:47:57 -0000 1.45
+++ members/memberentry.pl 2 Jul 2007 02:30:16 -0000 1.46
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.45 2007/05/30 08:47:57 tipaul Exp $
+# $Id: memberentry.pl,v 1.46 2007/07/02 02:30:16 rangi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -83,6 +83,8 @@
# NOTE: Alert for ethnicity and ethnotes fields, they are unvalided in all borrowers form
my $borrower_data;
+$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
+
#function to automatic setup the mandatory fields (visual with css)
my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
my @field_check=split(/\|/,$check_BorrowerMandatoryField);
Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- updater/updatedatabase 26 Jun 2007 13:25:37 -0000 1.170
+++ updater/updatedatabase 2 Jul 2007 02:30:16 -0000 1.171
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.170 2007/06/26 13:25:37 tipaul Exp $
+# $Id: updatedatabase,v 1.171 2007/07/02 02:30:16 rangi Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -519,6 +519,14 @@
explanation => "Enter a specific hash for NoZebra indexes. Enter : 'indexname' => '100a,245a,500*','index2' => '...'",
type => 'Free',
},
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'uppercasesurnames',
+ value => '0',
+ forceupdate => {'explanation' => 1, 'type' => 1},
+ explanation => "Force Surnames to be uppercase",
+ type => 'YesNo',
+ },
],
userflags => [
{
@@ -2048,6 +2056,9 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.171 2007/07/02 02:30:16 rangi
+# Fix for bug 1296, making surnames uppercase a systems preference
+#
# Revision 1.170 2007/06/26 13:25:37 tipaul
# removing some useless tables from updatedatabase
#
More information about the Koha-cvs
mailing list