From 54451b66a15e7b1808001c8a8fdaef10194ed685 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 24 Jun 2016 13:32:35 +0000 Subject: [PATCH] Bug 15485 - DBRev 16.06.00.004 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../atomicupdate/bug_15485_xslt_for_lists.sql | 26 ------------------- installer/data/mysql/updatedatabase.pl | 18 +++++++++++++ 3 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15485_xslt_for_lists.sql diff --git a/Koha.pm b/Koha.pm index 3860962b89..fed90fba4e 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "16.06.00.003"; +$VERSION = "16.06.00.004"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_15485_xslt_for_lists.sql b/installer/data/mysql/atomicupdate/bug_15485_xslt_for_lists.sql deleted file mode 100644 index 73568892b3..0000000000 --- a/installer/data/mysql/atomicupdate/bug_15485_xslt_for_lists.sql +++ /dev/null @@ -1,26 +0,0 @@ - -INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) - SELECT 'OPACXSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on OPAC', 'Free' - FROM systempreferences WHERE variable='OPACXSLTResultsDisplay'; - -INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) - SELECT 'XSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on intranet', 'Free' - FROM systempreferences WHERE variable='XSLTResultsDisplay'; - --- $DBversion = '16.06.00.XXX'; --- if ( CheckVersion($DBversion) ) { --- $dbh->do(q{ --- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) --- SELECT 'OPACXSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on OPAC', 'Free' --- FROM systempreferences WHERE variable='OPACXSLTResultsDisplay'; --- }); - --- $dbh->do(q{ --- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) --- SELECT 'XSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on intranet', 'Free' --- FROM systempreferences WHERE variable='XSLTResultsDisplay'; --- }); - --- print "Upgrade to $DBversion done (Bug 15485: Allow choosing different XSLTs for lists)\n"; --- SetVersion($DBversion); --- } diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index ed5d6ecda7..edecf61e0d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12655,6 +12655,24 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = '16.06.00.004'; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) + SELECT 'OPACXSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on OPAC', 'Free' + FROM systempreferences WHERE variable='OPACXSLTResultsDisplay'; + }); + + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) + SELECT 'XSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on intranet', 'Free' + FROM systempreferences WHERE variable='XSLTResultsDisplay'; + }); + + print "Upgrade to $DBversion done (Bug 15485: Allow choosing different XSLTs for lists)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 -- 2.20.1