oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove WebGUI::Utility::isIn

Browse source
This commit is contained in:
Graham Knop 2010-09-07 12:33:15 -05:00
parent 0e754a51e4
commit 6aa26c2e44
61 changed files with 126 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/AssetTrash.pm
View file

@ -15,7 +15,7 @@ package WebGUI::Asset;
=cut
use strict;
use WebGUI::Utility qw(isIn);
use WebGUI::Utility qw();
use Number::Format ();
use JSON;
@ -326,7 +326,7 @@ sub www_delete {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->get('isSystem');
return $self->session->privilege->vitalComponent() if (isIn($self->getId, $self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
return $self->session->privilege->vitalComponent() if ($self->getId ~~ [$self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")]);
$self->trash;
my $asset = $self->getContainer;
if ($self->getId eq $asset->getId) {