[Koha-cvs] koha admin/systempreferences.pl circ/circulatio... [dev_week]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Owen Leonard <oleonard> 06/07/13 21:09:26

Modified files:
        admin          : systempreferences.pl 
        circ           : circulation.pl 
        koha-tmpl/intranet-tmpl/npl/en/circ: circulation.tmpl 
        updater        : updatedatabase 

Log message:
        Adding system preference to control whether 'Specify Due Date' form 
appears on circulation page

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.18.2.1&r2=1.22.2.18.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.2&r2=1.81.2.14.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.17.2.1&r2=1.6.2.17.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=dev_week&r1=1.100.2.43.2.1&r2=1.100.2.43.2.2

Patches:
Index: admin/systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.18.2.1
retrieving revision 1.22.2.18.2.2
diff -u -b -r1.22.2.18.2.1 -r1.22.2.18.2.2
--- admin/systempreferences.pl  10 Jul 2006 21:45:54 -0000      1.22.2.18.2.1
+++ admin/systempreferences.pl  13 Jul 2006 21:09:25 -0000      1.22.2.18.2.2
@@ -80,6 +80,7 @@
        $tabsysprefs{patronimages}="Circulation";
        $tabsysprefs{printcirculationslips}="Circulation";
        $tabsysprefs{ReturnBeforeExpiry}="Circulation";
+       $tabsysprefs{SpecifyDueDate}="Circulation";
 # Intranet
        $tabsysprefs{TemplateEncoding}="Intranet";
        $tabsysprefs{template}="Intranet";

Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.2
retrieving revision 1.81.2.14.2.3
diff -u -b -r1.81.2.14.2.2 -r1.81.2.14.2.3
--- circ/circulation.pl 11 Jul 2006 13:26:36 -0000      1.81.2.14.2.2
+++ circ/circulation.pl 13 Jul 2006 21:09:25 -0000      1.81.2.14.2.3
@@ -333,6 +333,7 @@
                intranetstylesheet => 
C4::Context->preference("intranetstylesheet"),
                IntranetNav => C4::Context->preference("IntranetNav"),
                patronimages => C4::Context->preference("patronimages"),
+               SpecifyDueDate => C4::Context->preference("SpecifyDueDate")
                );
 output_html_with_http_headers $query, $cookie, $template->output;
 

Index: koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.17.2.1
retrieving revision 1.6.2.17.2.2
diff -u -b -r1.6.2.17.2.1 -r1.6.2.17.2.2
--- koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl        11 Jul 2006 
14:03:23 -0000      1.6.2.17.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl        13 Jul 2006 
21:09:25 -0000      1.6.2.17.2.2
@@ -193,8 +193,7 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
        <div class="details">
        <form method="post" action="/cgi-bin/koha/circ/circulation.pl" 
name="mainform">
-<label for="barcode">Enter Item Barcode: </label><input name="barcode" 
size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" 
onblur="this.className='unfocus'" /> <input type="submit" value="Issue" 
class="submit" /><!-- Display for NPL <input type="hidden" name="day" value="0" 
/><input type="hidden" name="month" value="0" /><input type="hidden" 
name="year" value="0" />  /Display for NPL -->
-       <!-- Hide from NPL      --><p class="date-select">
+<label for="barcode">Enter Item Barcode: </label><input name="barcode" 
size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" 
onblur="this.className='unfocus'" /> <input type="submit" value="Issue" 
class="submit" />     <!-- TMPL_IF name="SpecifyDueDate"      --><p 
class="date-select">
                        <label for="month">Specify Due Date: </label>
                        <select name="month" id="month">
                                <option value="0">Month</option>
@@ -253,7 +252,7 @@
                                <option value="2007"<!-- TMPL_IF 
NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
                                <option value="2008"<!-- TMPL_IF 
NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</option>
                        </select>
-<label for="stickyduedate">Remember for Session:</label><input type="checkbox" 
id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />   
<!-- /Hide from NPL -->
+<label for="stickyduedate">Remember for Session:</label><input type="checkbox" 
id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />   
<!-- TMPL_ELSE --><input type="hidden" name="day" value="0" /><input 
type="hidden" name="month" value="0" /><input type="hidden" name="year" 
value="0" /><!-- /TMPL_IF -->
                <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" />
                <input type="hidden" name="branch" value="<!-- TMPL_VAR 
NAME="branch" -->" />
                <input type="hidden" name="printer" value="<!-- TMPL_VAR 
NAME="printer" -->" />

Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.43.2.1
retrieving revision 1.100.2.43.2.2
diff -u -b -r1.100.2.43.2.1 -r1.100.2.43.2.2
--- updater/updatedatabase      28 May 2006 19:20:24 -0000      1.100.2.43.2.1
+++ updater/updatedatabase      13 Jul 2006 21:09:25 -0000      1.100.2.43.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.100.2.43.2.1 2006/05/28 19:20:24 tgarip1957 Exp $
+# $Id: updatedatabase,v 1.100.2.43.2.2 2006/07/13 21:09:25 oleonard Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -428,6 +428,15 @@
             explanation         => 'Are your patrons members of institutions',
             type                => 'YesNo',
         },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'SpecifyDueDate',
+            value               => '1',
+            forceupdate         => { 'explanation' => 1,
+                                     'type' => 1},
+            explanation         => 'Choose whether to display "Specify Due 
Date" form in Circulation',
+            type                => 'YesNo',
+        },
     ],
 
 );
@@ -1587,6 +1596,9 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.100.2.43.2.2  2006/07/13 21:09:25  oleonard
+# Adding system preference to control whether 'Specify Due Date' form appears 
on circulation page
+#
 # Revision 1.100.2.43.2.1  2006/05/28 19:20:24  tgarip1957
 # New fields required for authorities and items for zebradb and etc.
 #