From 105a3a1b30d1b369b9cc802ac63fdbb77ce15991 Mon Sep 17 00:00:00 2001 From: David Bourgault Date: Fri, 29 Sep 2017 08:34:10 -0400 Subject: [PATCH] Bug 19368 - Correction on QA feedback * I removed the IGNORE in the atomicupdate SQL. There is currently no other systempreference by that name in Master so that should work fine - Removed leftover test values from syspref.sql - Removed extra $ in serial-search.tt - Removed leftover warn in serial-search.pl Passes QA test tool Signed-off-by: Alex Buckley --- installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt | 1 - serials/serials-search.pl | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql b/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql index 5bcdfda..893b943 100644 --- a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql +++ b/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql @@ -1 +1 @@ -INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free'); \ No newline at end of file +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 4e11b26..eba857f 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -476,7 +476,7 @@ 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','des du de la le les leur d l an a the',NULL,'Words to ignore in serial search','Free'), +('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'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index f072cb1..09594ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -38,7 +38,6 @@ return confirm(_("Are you sure you want to reopen this subscription?")); }); }); - $ //]]> diff --git a/serials/serials-search.pl b/serials/serials-search.pl index 3904e70..24bcbe6 100755 --- a/serials/serials-search.pl +++ b/serials/serials-search.pl @@ -140,8 +140,6 @@ for my $sub ( @subscriptions ) { $subsctitle =~ s/^\s+//; $sub->{titlesort} = ucfirst($subsctitle); - warn $subsctitle; - unless ( $sub->{closed} ) { push @openedsubscriptions, $sub unless $sub->{cannotdisplay}; -- 2.1.4