Attachment 2743 Details for Bug 5396 – Proposed patch, with 2 signoffs

[patch] Proposed patch, with 2 signoffs

0001--SIGNED-OFF-Bug-5396-New-system-preference-UseTable.patch (text/plain), 8.13 KB, created by Ian Walls on 2010-11-12 20:59:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Walls

Created: 2010-11-12 20:59:03 UTC

Size: 8.13 KB

patch

obsolete

>From c21545c8e2cc56d8eb3a7533aa069b6912d4b1bb Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 9 Sep 2010 13:38:19 -0400
>Subject: [PATCH] [SIGNED-OFF]Bug 5396: New system preference UseTablesortForCirc
>Content-Type: text/plain; charset="utf-8"
>
>This system preference allows the librarian to toggle on or off whether the JQuery tablesort is used on the
>circ/circulation.pl page.  For patrons with many checkouts, this sort may cause very slow page loading (and
>therefore slow circulation transaction time), depending on the browser and local machine used.  Staff can
>still see a sortable list of current checkouts on the members/moremember.pl page.
>
>My revision prevents the template from including *any* tablesorter code if the
>preference is feature is turned off: both the circulation list and
>the holds list will have no jQuery tablesorter.
>
>Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
>Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
>---
> circ/circulation.pl                                |    4 ++++
> installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
> installer/data/mysql/updatedatabase.pl             |    8 ++++++++
> .../en/modules/admin/preferences/circulation.pref  |    6 ++++++
> .../prog/en/modules/circ/circulation.tmpl          |   11 +++++------
> 5 files changed, 24 insertions(+), 6 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 539b88c..7c4a0dc 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -109,6 +109,10 @@ if (C4::Context->preference("DisplayClearScreenButton")) {
>     $template->param(DisplayClearScreenButton => 1);
> }
> 
>+if (C4::Context->preference("UseTablesortForCirc")) {
>+    $template->param(UseTablesortForCirc => 1);
>+}
>+
> my $barcode        = $query->param('barcode') || '';
> $barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
> 
>diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
>index caf1155..214d198 100644
>--- a/installer/data/mysql/en/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
>@@ -270,6 +270,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('A
> 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');
> 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');
> 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');
>+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');
> 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' );
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Enables ILS-DI services at OPAC.','','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 27daa38..7fea87a 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -3735,6 +3735,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     SetVersion ($DBversion);
> }
> 
>+<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl
> $DBversion = '3.01.00.999';
> if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
>@@ -3835,6 +3836,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = '3.03.00.XXX';
>+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>+    $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');");
>+    print "Upgrade to $DBversion done (Add UseTablesortForCirc syspref)\n";
>+    SetVersion ($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 DropAllForeignKeys($table)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>index 16b52ff..c4d4305 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>@@ -31,6 +31,12 @@ Circulation:
>                   desc: latest to earliest
>             - due date.
>         -
>+            - pref: UseTablesortForCirc
>+              choices:
>+                  yes: "Enable"
>+                  no: "Don't enable"
>+            - "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."
>+        -
>             - pref: soundon
>               choices: 
>                  yes: "Enable"
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
>index 0b4ac29..822de15 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
>@@ -5,20 +5,20 @@
> ()
> </title>
> 
>-<script type="text/javascript" src="/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>+<script type="text/javascript" src="/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
> <script type="text/javascript" src="/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> <script type="text/javascript">
> //<![CDATA[
>-$.tablesorter.addParser({
>+$.tablesorter.addParser({
>     id: 'articles',
>     is: function(s) {return false;  },
>     format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
>     type: 'text'
>-});
>+});
> window.onload=function(){ $('#findborrower').focus(); };
> 	 $(document).ready(function() {
>  		$('#patronlists > ul').tabs();
>-		$.tablesorter.defaults.widgets = ['zebra'];
>+		$.tablesorter.defaults.widgets = ['zebra'];
> 		$("#issuest").tablesorter({
> 		dateFormat: 'uk',
> 		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
>@@ -30,8 +30,7 @@ $.tablesorter.addParser({
> 		dateFormat: 'uk',
> 			sortList: [[0,0]],
> 			headers: { 1: { sorter: 'articles' }}
>-		});
>-
>+		});
>         
>         $( '#override_limit' ).click( function () {
>             if ( this.checked ) {
>-- 
>1.5.6.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 5396: 2743