Bug 14298: Update database

diff --git a/installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl b/installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl
deleted file mode 100644 (file)
index 9ec23a0..0000000
--- a/installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl
+++ /dev/null
@@ -1,27 +0,0 @@
-use Modern::Perl;
-
-use C4::Context;
-my $dbh = C4::Context->dbh;
-
-$dbh->do(q|
-    INSERT INTO permissions (module_bit, code, description)
-    VALUES (1, 'self_checkout', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID')
-|);
-
-my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
-
-$dbh->do(q|
-    UPDATE borrowers
-    SET flags=0
-    WHERE userid=?
-|, undef, $AutoSelfCheckID);
-
-$dbh->do(q|
-    DELETE FROM user_permissions
-    WHERE borrowernumber=(SELECT borrowernumber FROM borrowers WHERE userid=?)
-|, undef, $AutoSelfCheckID);
-
-$dbh->do(q|
-    INSERT INTO user_permissions(borrowernumber, module_bit, code)
-    SELECT borrowernumber, 1, 'self_checkout' FROM borrowers WHERE userid=?
-|, undef, $AutoSelfCheckID);

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 433d446..aabb944 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -9872,6 +9872,43 @@ if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done";
     SetVersion($DBversion);
 }
+$DBversion = "3.18.10.002";
+if ( CheckVersion($DBversion) ) {
+    print "Bug 14298: AutoSelfCheckID user should only be able to access SCO\n";
+    $dbh->do(
+        q|
+    INSERT INTO permissions (module_bit, code, description)
+        VALUES (1, 'self_checkout', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID')
+        |
+    );
+
+    my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
+
+    $dbh->do(
+        q|
+    UPDATE borrowers
+        SET flags=0
+            WHERE userid=?
+            |, undef, $AutoSelfCheckID
+    );
+
+    $dbh->do(
+        q|
+    DELETE FROM user_permissions
+        WHERE borrowernumber=(SELECT borrowernumber FROM borrowers WHERE userid=?)
+        |, undef, $AutoSelfCheckID
+    );
+
+    $dbh->do(
+        q|
+    INSERT INTO user_permissions(borrowernumber, module_bit, code)
+        SELECT borrowernumber, 1, 'self_checkout' FROM borrowers WHERE userid=?
+        |, undef, $AutoSelfCheckID
+    );
+    print
+"Upgrade to $DBversion done\n";
+    SetVersion($DBversion);
+}
 
 
 =head1 FUNCTIONS

diff --git a/kohaversion.pl b/kohaversion.pl
index 65bdba8..1eecf12 100644 (file)
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -17,7 +17,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.18.10.001';
+    our $VERSION = '3.18.10.002';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install