From 49f50a7f267e7ea105895dc5165965b149697fe3 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 26 Mar 2018 17:29:52 -0300
Subject: [PATCH] Bug 15492: DBRev 17.12.00.024

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 Koha.pm                                       |  2 +-
 .../data/mysql/atomicupdate/bug_15492.perl    | 69 -------------------
 installer/data/mysql/updatedatabase.pl        | 69 +++++++++++++++++++
 3 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_15492.perl

diff --git a/Koha.pm b/Koha.pm
index fe5d0d2345..d858a87ac5 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 = "17.12.00.023";
+$VERSION = "17.12.00.024";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_15492.perl b/installer/data/mysql/atomicupdate/bug_15492.perl
deleted file mode 100644
index 54d37bcd8c..0000000000
--- a/installer/data/mysql/atomicupdate/bug_15492.perl
+++ /dev/null
@@ -1,69 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInMainUserBlock', '', '70|10', 'Add a block of HTML that will display on the self check-in screen.', 'Textarea');
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInModule', 0, NULL, 'Enable the standalone self-checkin module.', 'YesNo');
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInModuleUserID', NULL, NULL, 'Patron ID (borrowernumber) to be allowed on the self-checkin module.', 'Integer');
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInTimeout', 120, NULL, 'Define the number of seconds before the self check-in module times out.', 'Integer');
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInUserCSS', '', NULL, 'Add CSS to be included in the self check-in module in an embedded <style> tag.', 'free');
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        VALUES ('SelfCheckInUserJS', '', NULL, 'Define custom javascript for inclusion in the self check-in module.', 'free');
-    });
-
-    # Add new userflag for self check
-    $dbh->do(q{
-        INSERT IGNORE INTO userflags (bit,flag,flagdesc,defaulton) VALUES
-            (23,'self_check','Self check modules',0);
-    });
-
-    # Add self check-in module subpermission
-    $dbh->do(q{
-        INSERT IGNORE INTO permissions (module_bit,code,description)
-        VALUES (23, 'self_checkin_module', 'Log into the self check-in module');
-    });
-
-    # Add self check-in module subpermission
-    $dbh->do(q{
-        INSERT IGNORE INTO permissions (module_bit,code,description)
-        VALUES (23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID');
-    });
-
-    # Update patrons with self_checkout permission
-    # IMPORTANT: Needs to happen before removing the old subpermission
-    $dbh->do(q{
-        UPDATE user_permissions
-        SET module_bit = 23,
-                  code = 'self_checkout_module'
-        WHERE module_bit = 1 AND code = 'self_checkout';
-    });
-
-    # Remove old self_checkout permission
-    $dbh->do(q{
-        DELETE IGNORE FROM permissions
-        WHERE  code='self_checkout';
-    });
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 15492: Add a standalone self-checkin module)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index a5d143e54a..a498721ab9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -15637,6 +15637,75 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 20264 - Remove system preference 'checkdigit')\n";
 }
 
+$DBversion = '17.12.00.024';
+if( CheckVersion( $DBversion ) ) {
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInMainUserBlock', '', '70|10', 'Add a block of HTML that will display on the self check-in screen.', 'Textarea');
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInModule', 0, NULL, 'Enable the standalone self-checkin module.', 'YesNo');
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInModuleUserID', NULL, NULL, 'Patron ID (borrowernumber) to be allowed on the self-checkin module.', 'Integer');
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInTimeout', 120, NULL, 'Define the number of seconds before the self check-in module times out.', 'Integer');
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInUserCSS', '', NULL, 'Add CSS to be included in the self check-in module in an embedded <style> tag.', 'free');
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('SelfCheckInUserJS', '', NULL, 'Define custom javascript for inclusion in the self check-in module.', 'free');
+    });
+
+    # Add new userflag for self check
+    $dbh->do(q{
+        INSERT IGNORE INTO userflags (bit,flag,flagdesc,defaulton) VALUES
+            (23,'self_check','Self check modules',0);
+    });
+
+    # Add self check-in module subpermission
+    $dbh->do(q{
+        INSERT IGNORE INTO permissions (module_bit,code,description)
+        VALUES (23, 'self_checkin_module', 'Log into the self check-in module');
+    });
+
+    # Add self check-in module subpermission
+    $dbh->do(q{
+        INSERT IGNORE INTO permissions (module_bit,code,description)
+        VALUES (23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID');
+    });
+
+    # Update patrons with self_checkout permission
+    # IMPORTANT: Needs to happen before removing the old subpermission
+    $dbh->do(q{
+        UPDATE user_permissions
+        SET module_bit = 23,
+                  code = 'self_checkout_module'
+        WHERE module_bit = 1 AND code = 'self_checkout';
+    });
+
+    # Remove old self_checkout permission
+    $dbh->do(q{
+        DELETE IGNORE FROM permissions
+        WHERE  code='self_checkout';
+    });
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 15492: Add a standalone self-checkin module)\n";
+}
 
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
-- 
2.39.2