Bug fixes

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
index 3e5ab0d..75125f1 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE NAME="opac-top.inc">
 
-<TMPL_IF NAME="loggedinuser">
+<TMPL_IF NAME="loggedinusername">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
index 1439a27..b3eab0e 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
@@ -2,7 +2,7 @@
 
 <center>
 
-<TMPL_IF NAME="loggedinuser">
+<TMPL_IF NAME="loggedinusername">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
index 8905c17..b8f693e 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE NAME="opac-top.inc">
 
-<TMPL_IF NAME="loggedinuser">
+<TMPL_IF NAME="loggedinusername">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
index 5518e7d..d5ca11c 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
@@ -2,7 +2,7 @@
 
 <center>
 
-<TMPL_IF NAME="loggedinuser">
+<TMPL_IF NAME="loggedinusername">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
index 0213ccd..9bbd08d 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE NAME="members-top.inc">
 
-<TMPL_IF NAME="loggedinuser">
+<TMPL_IF NAME="loggedinusername">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 58015da..c951866 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -13,8 +13,9 @@ use C4::Reserves2;
 use C4::Interface::CGI::Output;
 use HTML::Template;
 use C4::Date;
+use C4::Context;
 
-my $MAXIMUM_NUMBER_OF_RESERVES = 5;
+my $MAXIMUM_NUMBER_OF_RESERVES = C$::Context->preference("maxreserves");
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie)
@@ -227,7 +228,8 @@ if ($query->param('item_types_selected')) {
 } else {
        # Here we check that the borrower can actually make reserves Stage 1.
        my $noreserves = 0;
-       if ($borr->{'amountoutstanding'} > 5) {
+       my $maxoutstanding = C4::Context->preference("maxoustanding");
+       if ($borr->{'amountoutstanding'} > $maxoutstanding) {
                my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
                $template->param(message => 1);
                $noreserves = 1;

diff --git a/updater/updatedatabase b/updater/updatedatabase
index 0688e3a..6a74470 100755 (executable)
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -435,6 +435,20 @@ my %tabledata = (
         },
         {
             uniquefieldrequired => 'variable',
+            variable            => 'maxoutstanding',
+            value               => '5',
+            explanation         =>
+            'maximum amount withstanding to be able make reserves '
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'maxreserves',
+            value               => '5',
+            explanation         =>
+            'maximum number of reserves a member can make '
+        },
+        {
+            uniquefieldrequired => 'variable',
             variable            => 'KohaAdminEmailAddress',
             value               => 'your.mail@here',
             explanation => 'the email adress where borrowers modifs are sent'
@@ -757,6 +771,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.45  2003/05/08 12:26:16  wolfpac444
+# Bug fixes
+#
 # Revision 1.44  2003/05/03 05:39:57  rangi
 # Fixing bug 429
 # (Wording changes in the explanation fields in system preferences)