Attachment 67447 Details for Bug 19368 – Bug 19368 - Correction on QA feedback

[patch] Bug 19368 - Correction on QA feedback

Bug-19368---Correction-on-QA-feedback.patch (text/plain), 3.69 KB, created by David Bourgault on 2017-09-29 12:35:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Bourgault

Created: 2017-09-29 12:35:43 UTC

Size: 3.69 KB

patch

obsolete

>From 269d2bf539b56799eebe4dde9649a47e25e6c82d Mon Sep 17 00:00:00 2001
>From: David Bourgault <david.bourgault@inlibro.com>
>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
>---
> 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 7c68507..acaad44 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -475,7 +475,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?"));
>     });
>  });
>-  $
>  //]]>
> </script>
> <style type="text/css">input.dt-filter { width : 100%; font-size : 85%; }</style>
>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.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