View | Details | Raw Unified | Return to bug 5396
Collapse All | Expand All

(-)a/circ/circulation.pl (+4 lines)
Lines 109-114 if (C4::Context->preference("DisplayClearScreenButton")) { Link Here
109
    $template->param(DisplayClearScreenButton => 1);
109
    $template->param(DisplayClearScreenButton => 1);
110
}
110
}
111
111
112
if (C4::Context->preference("UseTablesortForCirc")) {
113
    $template->param(UseTablesortForCirc => 1);
114
}
115
112
my $barcode        = $query->param('barcode') || '';
116
my $barcode        = $query->param('barcode') || '';
113
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
117
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
114
118
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 270-275 INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('A Link Here
270
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckID','','Staff ID with circulation rights to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
270
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckID','','Staff ID with circulation rights to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
271
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckPass','','Password to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
271
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckPass','','Password to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
272
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('soundon','0','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','','YesNo');
272
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('soundon','0','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','','YesNo');
273
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTablesortForCirc','0','If on, use the JQuery tablesort function on the list of current borrower checkouts on the circulation page.  Note that the use of this function may slow down circ for patrons with may checkouts.','','YesNo');
273
INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'PrintNoticesMaxLines', '0', '', 'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.', 'Integer' );
274
INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'PrintNoticesMaxLines', '0', '', 'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.', 'Integer' );
274
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Enables ILS-DI services at OPAC.','','YesNo');
275
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Enables ILS-DI services at OPAC.','','YesNo');
275
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
276
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 3735-3740 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3735
    SetVersion ($DBversion);
3735
    SetVersion ($DBversion);
3736
}
3736
}
3737
3737
3738
<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl
3738
$DBversion = '3.01.00.999';
3739
$DBversion = '3.01.00.999';
3739
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3740
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3740
    print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
3741
    print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
Lines 3835-3840 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3835
    SetVersion ($DBversion);
3836
    SetVersion ($DBversion);
3836
}
3837
}
3837
3838
3839
$DBversion = '3.03.00.XXX';
3840
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3841
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTablesortForCirc','0','If on, use the JQuery tablesort function on the list of current borrower checkouts on the circulation page. Note that the use of this function may slow down circ for patrons with may checkouts.','','YesNo');");
3842
    print "Upgrade to $DBversion done (Add UseTablesortForCirc syspref)\n";
3843
    SetVersion ($DBversion);
3844
}
3845
3838
=head1 FUNCTIONS
3846
=head1 FUNCTIONS
3839
3847
3840
=head2 DropAllForeignKeys($table)
3848
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 31-36 Circulation: Link Here
31
                  desc: latest to earliest
31
                  desc: latest to earliest
32
            - due date.
32
            - due date.
33
        -
33
        -
34
            - pref: UseTablesortForCirc
35
              choices:
36
                  yes: "Enable"
37
                  no: "Don't enable"
38
            - "the sorting of current patron checkouts on the circulation screen. <br/>NOTE: Enabling this function may slow down circulation time for patrons with many checkouts."
39
        -
34
            - pref: soundon
40
            - pref: soundon
35
              choices: 
41
              choices: 
36
                 yes: "Enable"
42
                 yes: "Enable"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl (-7 / +5 lines)
Lines 5-24 Link Here
5
(<!-- TMPL_VAR NAME="cardnumber" -->)
5
(<!-- TMPL_VAR NAME="cardnumber" -->)
6
<!-- /TMPL_IF --></title>
6
<!-- /TMPL_IF --></title>
7
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
7
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
8
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
8
<!-- TMPL_IF NAME="UseTablesortForCirc" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script><!-- /TMPL_IF -->
9
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
9
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
10
<script type="text/javascript">
10
<script type="text/javascript">
11
//<![CDATA[
11
//<![CDATA[
12
$.tablesorter.addParser({
12
<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.addParser({
13
    id: 'articles',
13
    id: 'articles',
14
    is: function(s) {return false;  },
14
    is: function(s) {return false;  },
15
    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
15
    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
16
    type: 'text'
16
    type: 'text'
17
});
17
});<!-- /TMPL_IF -->
18
<!-- TMPL_UNLESS NAME="borrowernumber" --><!-- TMPL_UNLESS NAME="CGIselectborrower" -->window.onload=function(){ $('#findborrower').focus(); };<!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
18
<!-- TMPL_UNLESS NAME="borrowernumber" --><!-- TMPL_UNLESS NAME="CGIselectborrower" -->window.onload=function(){ $('#findborrower').focus(); };<!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
19
	 $(document).ready(function() {
19
	 $(document).ready(function() {
20
 		$('#patronlists > ul').tabs();
20
 		$('#patronlists > ul').tabs();
21
		$.tablesorter.defaults.widgets = ['zebra'];
21
		<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.defaults.widgets = ['zebra'];
22
		$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
22
		$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
24
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
24
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
Lines 30-37 $.tablesorter.addParser({ Link Here
30
		dateFormat: 'uk',<!-- /TMPL_IF -->
30
		dateFormat: 'uk',<!-- /TMPL_IF -->
31
			sortList: [[0,0]],
31
			sortList: [[0,0]],
32
			headers: { 1: { sorter: 'articles' }}
32
			headers: { 1: { sorter: 'articles' }}
33
		});
33
		});<!-- /TMPL_IF -->
34
35
        <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
34
        <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
36
        $( '#override_limit' ).click( function () {
35
        $( '#override_limit' ).click( function () {
37
            if ( this.checked ) {
36
            if ( this.checked ) {
38
- 

Return to bug 5396