Lines 60-77
sub store {
Link Here
|
60 |
Koha::Exceptions::Virtualshelves::DuplicateObject->throw; |
60 |
Koha::Exceptions::Virtualshelves::DuplicateObject->throw; |
61 |
} |
61 |
} |
62 |
|
62 |
|
63 |
$self->allow_add( 0 ) |
63 |
$self->allow_change_from_owner( 1 ) |
64 |
unless defined $self->allow_add; |
64 |
unless defined $self->allow_change_from_owner; |
65 |
$self->allow_delete_own( 1 ) |
65 |
$self->allow_change_from_others( 0 ) |
66 |
unless defined $self->allow_delete_own; |
66 |
unless defined $self->allow_change_from_others; |
67 |
$self->allow_delete_other( 0 ) |
|
|
68 |
unless defined $self->allow_delete_other; |
69 |
|
67 |
|
70 |
$self->created_on( dt_from_string ); |
68 |
$self->created_on( dt_from_string ); |
71 |
|
69 |
|
72 |
return $self->SUPER::store( $self ); |
70 |
return $self->SUPER::store( $self ); |
73 |
} |
71 |
} |
74 |
|
72 |
|
|
|
73 |
sub is_public { |
74 |
my ( $self ) = @_; |
75 |
return $self->category == $PUBLIC; |
76 |
} |
77 |
|
78 |
sub is_private { |
79 |
my ( $self ) = @_; |
80 |
return $self->category == $PRIVATE; |
81 |
} |
82 |
|
75 |
sub is_shelfname_valid { |
83 |
sub is_shelfname_valid { |
76 |
my ( $self ) = @_; |
84 |
my ( $self ) = @_; |
77 |
|
85 |
|
Lines 80-93
sub is_shelfname_valid {
Link Here
|
80 |
( $self->shelfnumber ? ( "me.shelfnumber" => { '!=', $self->shelfnumber } ) : () ), |
88 |
( $self->shelfnumber ? ( "me.shelfnumber" => { '!=', $self->shelfnumber } ) : () ), |
81 |
}; |
89 |
}; |
82 |
|
90 |
|
83 |
if ( $self->category == $PRIVATE and defined $self->owner ) { |
91 |
if ( $self->is_private and defined $self->owner ) { |
84 |
$conditions->{-or} = { |
92 |
$conditions->{-or} = { |
85 |
"virtualshelfshares.borrowernumber" => $self->owner, |
93 |
"virtualshelfshares.borrowernumber" => $self->owner, |
86 |
"me.owner" => $self->owner, |
94 |
"me.owner" => $self->owner, |
87 |
}; |
95 |
}; |
88 |
$conditions->{category} = $PRIVATE; |
96 |
$conditions->{category} = $PRIVATE; |
89 |
} |
97 |
} |
90 |
elsif ( $self->category == $PRIVATE and not defined $self->owner ) { |
98 |
elsif ( $self->is_private and not defined $self->owner ) { |
91 |
$conditions->{owner} = undef; |
99 |
$conditions->{owner} = undef; |
92 |
$conditions->{category} = $PRIVATE; |
100 |
$conditions->{category} = $PRIVATE; |
93 |
} |
101 |
} |
Lines 174-179
sub add_biblio {
Link Here
|
174 |
} |
182 |
} |
175 |
)->count; |
183 |
)->count; |
176 |
return if $already_exists; |
184 |
return if $already_exists; |
|
|
185 |
|
186 |
# Check permissions |
187 |
return unless ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) || $self->allow_change_from_others; |
188 |
|
177 |
my $content = Koha::Virtualshelfcontent->new( |
189 |
my $content = Koha::Virtualshelfcontent->new( |
178 |
{ |
190 |
{ |
179 |
shelfnumber => $self->shelfnumber, |
191 |
shelfnumber => $self->shelfnumber, |
Lines 194-231
sub remove_biblios {
Link Here
|
194 |
return unless @$biblionumbers; |
206 |
return unless @$biblionumbers; |
195 |
|
207 |
|
196 |
my $number_removed = 0; |
208 |
my $number_removed = 0; |
197 |
for my $biblionumber ( @$biblionumbers ) { |
209 |
if( ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) |
198 |
if ( $self->owner == $borrowernumber or $self->allow_delete_own ) { |
210 |
|| $self->allow_change_from_others ) { |
199 |
$number_removed += $self->get_contents->search( |
211 |
$number_removed += $self->get_contents->search({ |
200 |
{ |
212 |
biblionumber => $biblionumbers, |
201 |
biblionumber => $biblionumber, |
213 |
})->delete; |
202 |
borrowernumber => $borrowernumber, |
|
|
203 |
} |
204 |
)->delete; |
205 |
} |
206 |
if ( $self->allow_delete_other ) { |
207 |
$number_removed += $self->get_contents->search( |
208 |
{ |
209 |
biblionumber => $biblionumber, |
210 |
# FIXME |
211 |
# This does not make sense, but it's has been backported from DelFromShelf. |
212 |
# Why shouldn't we allow to remove his own contribution if allow_delete_other is on? |
213 |
borrowernumber => { |
214 |
-or => { |
215 |
'!=' => $borrowernumber, |
216 |
'=' => undef |
217 |
} |
218 |
}, |
219 |
} |
220 |
)->delete; |
221 |
} |
222 |
} |
214 |
} |
223 |
return $number_removed; |
215 |
return $number_removed; |
224 |
} |
216 |
} |
225 |
|
217 |
|
226 |
sub can_be_viewed { |
218 |
sub can_be_viewed { |
227 |
my ( $self, $borrowernumber ) = @_; |
219 |
my ( $self, $borrowernumber ) = @_; |
228 |
return 1 if $self->category == $PUBLIC; |
220 |
return 1 if $self->is_public; |
229 |
return 0 unless $borrowernumber; |
221 |
return 0 unless $borrowernumber; |
230 |
return 1 if $self->owner == $borrowernumber; |
222 |
return 1 if $self->owner == $borrowernumber; |
231 |
return $self->get_shares->search( |
223 |
return $self->get_shares->search( |
Lines 243-249
sub can_be_deleted {
Link Here
|
243 |
|
235 |
|
244 |
my $patron = Koha::Patrons->find( $borrowernumber ); |
236 |
my $patron = Koha::Patrons->find( $borrowernumber ); |
245 |
|
237 |
|
246 |
return 1 if $self->category == $PUBLIC and C4::Auth::haspermission( $patron->userid, { lists => 'delete_public_lists' } ); |
238 |
return 1 if $self->is_public and C4::Auth::haspermission( $patron->userid, { lists => 'delete_public_lists' } ); |
247 |
|
239 |
|
248 |
return 0; |
240 |
return 0; |
249 |
} |
241 |
} |
Lines 260-279
sub can_biblios_be_added {
Link Here
|
260 |
|
252 |
|
261 |
return 1 |
253 |
return 1 |
262 |
if $borrowernumber |
254 |
if $borrowernumber |
263 |
and ( $self->owner == $borrowernumber |
255 |
and ( ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) or $self->allow_change_from_others ); |
264 |
or $self->allow_add ); |
|
|
265 |
return 0; |
256 |
return 0; |
266 |
} |
257 |
} |
267 |
|
258 |
|
268 |
sub can_biblios_be_removed { |
259 |
sub can_biblios_be_removed { |
269 |
my ( $self, $borrowernumber ) = @_; |
260 |
my ( $self, $borrowernumber ) = @_; |
270 |
|
261 |
return $self->can_biblios_be_added( $borrowernumber ); |
271 |
return 1 |
262 |
# Same answer since bug 18228 |
272 |
if $borrowernumber |
|
|
273 |
and ( $self->owner == $borrowernumber |
274 |
or $self->allow_delete_own |
275 |
or $self->allow_delete_other ); |
276 |
return 0; |
277 |
} |
263 |
} |
278 |
|
264 |
|
279 |
sub _type { |
265 |
sub _type { |