Bug 4941 - DBRev 3.23.00.027

This commit is contained in:
Kyle Hall 2016-02-26 12:28:55 +00:00
parent a6dc6a28f3
commit eaaea6ed27
3 changed files with 16 additions and 14 deletions

View file

@ -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 = "3.23.00.026";
$VERSION = "3.23.00.027";
sub version {
return $VERSION;

View file

@ -1,13 +0,0 @@
use Modern::Perl;
use C4::Context;
my $dbh = C4::Context->dbh;
my ( $db_value ) = $dbh->selectrow_array(q|SELECT count(*) FROM branches|);
my $pref_value = C4::Context->preference("singleBranchMode") || 0;
if ( $db_value > 1 and $pref_value == 1 ) {
warn "WARNING: You have more than 1 libraries in your branches tables but the singleBranchMode system preference is on.\n";
warn "This configuration does not make sense. The system preference is going to be deleted,\n";
warn "and this parameter will be based on the number of libraries defined.\n";
}
$dbh->do(q|DELETE FROM systempreferences WHERE variable="singleBranchMode"|);

View file

@ -11830,6 +11830,21 @@ if ( CheckVersion($DBversion) ) {
SetVersion($DBversion);
}
$DBversion = "3.23.00.027";
if ( CheckVersion($DBversion) ) {
my ( $db_value ) = $dbh->selectrow_array(q|SELECT count(*) FROM branches|);
my $pref_value = C4::Context->preference("singleBranchMode") || 0;
if ( $db_value > 1 and $pref_value == 1 ) {
warn "WARNING: You have more than 1 libraries in your branches tables but the singleBranchMode system preference is on.\n";
warn "This configuration does not make sense. The system preference is going to be deleted,\n";
warn "and this parameter will be based on the number of libraries defined.\n";
}
$dbh->do(q|DELETE FROM systempreferences WHERE variable="singleBranchMode"|);
print "Upgrade to $DBversion done (Bug 4941 - Can't set branch in staff client when singleBranchMode is enabled)\n";
SetVersion($DBversion);
}
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
# SEE bug 13068
# if there is anything in the atomicupdate, read and execute it.