Tomas Cohen Arazi
0c72031539
This patchset moves the 'category' attribute for virtual shelves, that
takes values of 1 and 2 (private and public respectively) into a boolean
for public.
The DBRev is trivial, and the changes to the code are as well.
To test:
1. have some known public and private lists
2. Apply this patches
3. Run:
$ updatedatabase
=> SUCCESS: Public lists have public=1, private have public=0
4. Run:
$ kshell
k$ prove t/db_dependent/Utils/Datatables_Virtualshelves.t \
t/db_dependent/Virtualshelves.t
=> SUCCESS: Tests pass!
5. Try the feature in staff and OPAC
=> SUCCESS: All good
6. Sign off :-D
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
170 lines
4 KiB
Perl
170 lines
4 KiB
Perl
package Koha::Virtualshelves;
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
|
|
use Koha::Database;
|
|
|
|
use Koha::Virtualshelf;
|
|
|
|
use base qw(Koha::Objects);
|
|
|
|
=head1 NAME
|
|
|
|
Koha::Virtualshelf - Koha Virtualshelf Object class
|
|
|
|
=head1 API
|
|
|
|
=head2 Class Methods
|
|
|
|
=cut
|
|
|
|
=head3 type
|
|
|
|
=cut
|
|
|
|
sub get_private_shelves {
|
|
my ( $self, $params ) = @_;
|
|
my $page = $params->{page};
|
|
my $rows = $params->{rows};
|
|
my $borrowernumber = $params->{borrowernumber} || 0;
|
|
|
|
$self->search(
|
|
{
|
|
public => 0,
|
|
-or => {
|
|
'virtualshelfshares.borrowernumber' => $borrowernumber,
|
|
'me.owner' => $borrowernumber,
|
|
}
|
|
},
|
|
{
|
|
join => [ 'virtualshelfshares' ],
|
|
distinct => 'shelfnumber',
|
|
order_by => 'shelfname',
|
|
( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ),
|
|
}
|
|
);
|
|
}
|
|
|
|
|
|
sub get_public_shelves {
|
|
my ( $self, $params ) = @_;
|
|
my $page = $params->{page};
|
|
my $rows = $params->{rows};
|
|
|
|
$self->search(
|
|
{
|
|
public => 1,
|
|
},
|
|
{
|
|
distinct => 'shelfnumber',
|
|
order_by => 'shelfname',
|
|
( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ),
|
|
}
|
|
);
|
|
}
|
|
|
|
sub get_some_shelves {
|
|
my ( $self, $params ) = @_;
|
|
my $borrowernumber = $params->{borrowernumber} || 0;
|
|
my $public = $params->{public} || 0;
|
|
my $add_allowed = $params->{add_allowed};
|
|
|
|
my @conditions;
|
|
if ( $add_allowed ) {
|
|
push @conditions, {
|
|
-or =>
|
|
[
|
|
{
|
|
"me.owner" => $borrowernumber,
|
|
"me.allow_change_from_owner" => 1,
|
|
},
|
|
"me.allow_change_from_others" => 1,
|
|
]
|
|
};
|
|
}
|
|
if ( !$public ) {
|
|
push @conditions, {
|
|
-or =>
|
|
{
|
|
"virtualshelfshares.borrowernumber" => $borrowernumber,
|
|
"me.owner" => $borrowernumber,
|
|
}
|
|
};
|
|
}
|
|
|
|
$self->search(
|
|
{
|
|
public => $public,
|
|
( @conditions ? ( -and => \@conditions ) : () ),
|
|
},
|
|
{
|
|
join => [ 'virtualshelfshares' ],
|
|
distinct => 'shelfnumber',
|
|
order_by => { -desc => 'lastmodified' },
|
|
}
|
|
);
|
|
}
|
|
|
|
sub get_shelves_containing_record {
|
|
my ( $self, $params ) = @_;
|
|
my $borrowernumber = $params->{borrowernumber};
|
|
my $biblionumber = $params->{biblionumber};
|
|
|
|
my @conditions = ( 'virtualshelfcontents.biblionumber' => $biblionumber );
|
|
if ($borrowernumber) {
|
|
push @conditions,
|
|
{
|
|
-or => [
|
|
{
|
|
public => 0,
|
|
-or => {
|
|
'me.owner' => $borrowernumber,
|
|
-or => {
|
|
'virtualshelfshares.borrowernumber' => $borrowernumber,
|
|
},
|
|
}
|
|
},
|
|
{ public => 1 },
|
|
]
|
|
};
|
|
} else {
|
|
push @conditions, { public => 1 };
|
|
}
|
|
|
|
return Koha::Virtualshelves->search(
|
|
{
|
|
-and => \@conditions
|
|
},
|
|
{
|
|
join => [ 'virtualshelfcontents', 'virtualshelfshares' ],
|
|
distinct => 'shelfnumber',
|
|
order_by => { -asc => 'shelfname' },
|
|
}
|
|
);
|
|
}
|
|
|
|
sub _type {
|
|
return 'Virtualshelve';
|
|
}
|
|
|
|
sub object_class {
|
|
return 'Koha::Virtualshelf';
|
|
}
|
|
|
|
1;
|