@@ -, +, @@ --- installer/data/mysql/atomicupdate/bug_20157.perl | 3 +-- installer/data/mysql/updatedatabase.pl | 15 +++------------ 2 files changed, 4 insertions(+), 14 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_20157.perl +++ a/installer/data/mysql/atomicupdate/bug_20157.perl @@ -4,8 +4,7 @@ if( CheckVersion( $DBversion ) ) { if( !column_exists( 'library_groups', 'ft_search_groups_opac' ) ) { $dbh->do( "ALTER TABLE library_groups ADD COLUMN ft_search_groups_opac tinyint(1) NOT NULL DEFAULT 0 AFTER ft_hide_patron_info" ); $dbh->do( "ALTER TABLE library_groups ADD COLUMN ft_search_groups_staff tinyint(1) NOT NULL DEFAULT 0 AFTER ft_search_groups_opac" ); - $dbh->do( "UPDATE library_groups SET ft_search_groups_staff = 1 WHERE title = '__SEARCH_GROUPS__'" ); - $dbh->do( "UPDATE library_groups SET ft_search_groups_opac = 1 WHERE title = '__SEARCH_GROUPS_OPAC__'" ); + $dbh->do( "UPDATE library_groups SET ft_search_groups_staff = 1 AND ft_search_groups_opac = 1 WHERE title = '__SEARCH_GROUPS__'" ); } SetVersion( $DBversion ); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -15224,14 +15224,9 @@ $DBversion = "XXX"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - INSERT INTO library_groups ( title, description, created_on ) VALUES ( '__SEARCH_GROUPS__', 'Library search groups - Staff only', NOW() ) + INSERT INTO library_groups ( title, description, created_on ) VALUES ( '__SEARCH_GROUPS__', 'Library search groups', NOW() ) }); - my $search_groups_staff_root_id = $dbh->last_insert_id(undef, undef, 'library_groups', undef); - - $dbh->do(q{ - INSERT INTO library_groups ( title, description, created_on ) VALUE ( '__SEARCH_GROUPS_OPAC__', 'Library search groups - Staff only', NOW() ) - }); - my $search_groups_opac_root_id = $dbh->last_insert_id(undef, undef, 'library_groups', undef); + my $search_groups_root_id = $dbh->last_insert_id(undef, undef, 'library_groups', undef); my $sth = $dbh->prepare("SELECT * FROM branchcategories"); @@ -15246,11 +15241,7 @@ if ( CheckVersion($DBversion) ) { my $description = $lc->{categorycode}; $description .= " - " . $lc->{codedescription} if $lc->{codedescription}; - $sth2->execute( - $lc->{show_in_pulldown} ? $search_groups_opac_root_id : $search_groups_staff_root_id, - $lc->{categoryname}, - $description, - ); + $sth2->execute($search_groups_root_id, $lc->{categoryname}, $description); my $subgroup_id = $dbh->last_insert_id(undef, undef, 'library_groups', undef); --