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

12
lib/WebGUI/Asset/Sku/EMSBadge.pm
View file

@ -284,7 +284,11 @@ sub onRefund {
# get rid of any items in the cart related to this badge
foreach my $cartitem (@{$self->getCart->getItems()}) {
my $sku = $cartitem->getSku;
if (isIn((ref $sku), qw(WebGUI::Asset::Sku::EMSTicket WebGUI::Asset::Sku::EMSRibbon WebGUI::Asset::Sku::EMSToken))) {
if ((ref $sku) ~~ [qw(
WebGUI::Asset::Sku::EMSTicket
WebGUI::Asset::Sku::EMSRibbon
WebGUI::Asset::Sku::EMSToken
)]) {
if ($sku->getOptions->{badgeId} eq $badgeId) {
$cartitem->remove;
}
@ -309,7 +313,11 @@ sub onRemoveFromCart {
my $badgeId = $self->getOptions->{badgeId};
foreach my $cartitem (@{$item->cart->getItems()}) {
my $sku = $cartitem->getSku;
if (isIn((ref $sku), qw(WebGUI::Asset::Sku::EMSTicket WebGUI::Asset::Sku::EMSRibbon WebGUI::Asset::Sku::EMSToken))) {
if ((ref $sku) ~~ [qw(
WebGUI::Asset::Sku::EMSTicket
WebGUI::Asset::Sku::EMSRibbon
WebGUI::Asset::Sku::EMSToken
)]) {
if ($sku->getOptions->{badgeId} eq $badgeId) {
$cartitem->remove;
}

5
lib/WebGUI/Asset/Sku/EMSRibbon.pm
View file

@ -232,8 +232,9 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->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;
return $self->getParent->www_buildBadge(undef,'ribbons');
}

7
lib/WebGUI/Asset/Sku/EMSTicket.pm
View file

@ -328,7 +328,7 @@ sub getPrice {
my $discount = 0;
my $badgeId = $self->getOptions->{badgeId};
my $ribbonId = $self->session->db->quickScalar("select ribbonAssetId from EMSRegistrantRibbon where badgeId=? limit 1",[$badgeId]);
if (defined $ribbonId && isIn($ribbonId, @ribbonIds)) {
if (defined $ribbonId && $ribbonId ~~ @ribbonIds) {
my $ribbon = WebGUI::Asset->newById($self->session, $ribbonId);
$discount = $ribbon->percentageDiscount;
}
@ -536,7 +536,10 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->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;
return $self->getParent->www_buildBadge(undef,'tickets');
}

6
lib/WebGUI/Asset/Sku/EMSToken.pm
View file

@ -226,8 +226,10 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->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;
return $self->getParent->www_buildBadge(undef,'tokens');
}

2
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -1107,7 +1107,7 @@ sub www_deleteFileConfirm {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
my $column = $self->session->form->process("file");
return $self->www_edit unless (isIn($column, qw(image1 image2 image3 manual warranty brochure)));
return $self->www_edit unless $column ~~ [qw(image1 image2 image3 manual warranty brochure)];
my $store = $self->get($column);
my $file = WebGUI::Storage->get($self->session,$store);
$file->delete if defined $file;