Attachment 72045 Details for Bug 19368 – Bug 19368 - Syspref now "SortIgnoreArticles", used in datatables.inc

[patch] Bug 19368 - Syspref now "SortIgnoreArticles", used in datatables.inc

Bug-19368---Syspref-now-SortIgnoreArticles-used-in.patch (text/plain), 7.04 KB, created by Charles Farmer on 2018-02-21 17:44:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charles Farmer

Created: 2018-02-21 17:44:40 UTC

Size: 7.04 KB

patch

obsolete

>From 8714237d48b502d476d15af25bf10acc9184b94a Mon Sep 17 00:00:00 2001
>From: David Bourgault <david.bourgault@inlibro.com>
>Date: Wed, 4 Oct 2017 13:57:20 -0400
>Subject: [PATCH] Bug 19368 - Syspref now "SortIgnoreArticles", used in
> datatables.inc
>
>---
> installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql     | 1 +
> installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql  | 1 -
> installer/data/mysql/sysprefs.sql                                     | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc               | 3 ++-
> .../intranet-tmpl/prog/en/modules/admin/preferences/searching.pref    | 4 ++++
> koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc              | 4 ++--
> serials/serials-search.pl                                             | 2 +-
> 7 files changed, 11 insertions(+), 6 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql
> delete mode 100644 installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>
>diff --git a/installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql b/installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql
>new file mode 100644
>index 0000000..dda42f5
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql
>@@ -0,0 +1 @@
>+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SortIgnoreArticles','a an the',NULL,'Articles to ignore in when sorting','Free');
>\ No newline at end of file
>diff --git a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql b/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>deleted file mode 100644
>index 893b943..0000000
>--- a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>+++ /dev/null
>@@ -1 +0,0 @@
>-INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free');
>\ No newline at end of file
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 164a797..30dc2bf 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -487,7 +487,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),
> ('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
> ('SeparateHoldingsBranch','homebranch','homebranch|holdingbranch','Branch used to separate holdings','Choice'),
>-('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free'),
> ('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),
> ('SessionStorage','mysql','mysql|Pg|tmp','Use database or a temporary file for storing session data','Choice'),
> ('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),
>@@ -502,6 +501,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'),
> ('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free'),
> ('SocialNetworks','0','','Enable/Disable social networks links in opac detail pages','YesNo'),
>+('SortIgnoreArticles','',NULL,'Words to ignore in serial search','Free'),
> ('SpecifyDueDate','1','','Define whether to display \"Specify Due Date\" form in Circulation','YesNo'),
> ('SpecifyReturnDate',1,'','Define whether to display \"Specify Return Date\" form in Circulation','YesNo'),
> ('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>index d27059c..4f89eac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>@@ -1,3 +1,4 @@
>+[% USE Koha %]
> [% INCLUDE 'format_price.inc' %]
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/buttons.dataTables.min_[% KOHA_VERSION %].css" />
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min_[% KOHA_VERSION %].js"></script>
>@@ -19,7 +20,7 @@
>     var MSG_DT_SEARCH = _("Search:");
>     var MSG_DT_ZERO_RECORDS = _("No matching records found");
>     var MSG_DT_ALL = _("All");
>-    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
>+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
> //]]>
> </script>
> <script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>index ad28e82..2fde43d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>@@ -85,6 +85,10 @@ Searching:
>                   yes: Enable
>                   no: Disable
>             - "browsing search results fromt the bibliographic record detail page in staff client."
>+        -
>+            - 'Ignore the following words when sorting the serial search result table (separate words with spaces) :'
>+            - pref: SortIgnoreArticles
>+              class: free
>     Search Form:
>         -
>             - Load the unlogged history to the next user.
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>index b2f3e2a..b3070e1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>@@ -14,7 +14,7 @@
>     var MSG_DT_PROCESSING = _("Processing...");
>     var MSG_DT_SEARCH = _("Search:");
>     var MSG_DT_ZERO_RECORDS = _("No matching records found");
>-    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
>+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
> //]]>
> </script>
>-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script>
>\ No newline at end of file
>+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script>
>diff --git a/serials/serials-search.pl b/serials/serials-search.pl
>index 24bcbe6..fd30557 100755
>--- a/serials/serials-search.pl
>+++ b/serials/serials-search.pl
>@@ -123,7 +123,7 @@ if ($routing) {
> }
> 
> #sort stopword by  string length
>-my @sortedstopword = sort{ length $b <=> length $a } split ( / / ,C4::Context->preference("SerialSortIgnoreWords"));
>+my @sortedstopword = sort{ length $b <=> length $a } split ( / / ,C4::Context->preference("SortIgnoreArticles"));
> my $subsctitle;
> my (@openedsubscriptions, @closedsubscriptions);
> for my $sub ( @subscriptions ) {
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 19368: 67373 | 67447 | 67580 | 67581 | 67612 | 69005 | 70051 | 70052 | 70053 | 70125 | 71962 | 71963 | 71964 | 71965 | 72043 | 72044 | 72045 | 72046 | 72047 | 72655 | 72656 | 72657 | 72658 | 72659 | 74262 | 74263 | 74264 | 74265 | 74266 | 90915 | 90916 | 90918 | 90919 | 90920 | 90921 | 113018 | 113019 | 113020 | 113021 | 113022 | 113023 | 113344 | 113345 | 113346 | 113347 | 113348 | 113349 | 118963 | 118964 | 118965 | 118966 | 118967 | 118968 | 124090 | 124091 | 124092 | 124093 | 124094 | 124095 | 124096 | 124097 | 124104 | 124105 | 124106 | 124107 | 124108 | 124109 | 124110 | 124111