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

fixed: Deleting Ticket from Event Management System Asset

Browse source
This commit is contained in:
Yung Han Khoe 2008-07-12 19:02:00 +00:00
parent 60bb354a78
commit 939b5b4897
5 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ use strict;
use Tie::IxHash;
use base 'WebGUI::Asset::Sku';
use WebGUI::HTMLForm;
use WebGUI::Utility;
=head1 NAME
@ -235,8 +235,12 @@ Override to return to appropriate page.
sub www_delete {
my ($self) = @_;
$self->SUPER::www_delete;
return $self->getParent->www_buildBadge(undef,'ribbons');
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")));
$self->trash;
return $self->getParent->www_buildBadge(undef,'ribbons');
}

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

@ -18,7 +18,7 @@ use strict;
use base 'WebGUI::Asset::Sku';
use Tie::IxHash;
use JSON;
use WebGUI::Utility;
=head1 NAME
@ -476,7 +476,10 @@ Override to return to appropriate page.
sub www_delete {
my ($self) = @_;
$self->SUPER::www_delete;
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")));
$self->trash;
return $self->getParent->www_buildBadge(undef,'tickets');
}

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

@ -17,7 +17,7 @@ package WebGUI::Asset::Sku::EMSToken;
use strict;
use Tie::IxHash;
use base 'WebGUI::Asset::Sku';
use WebGUI::Utility;
=head1 NAME
@ -229,8 +229,12 @@ Override to return to appropriate page.
sub www_delete {
my ($self) = @_;
$self->SUPER::www_delete;
return $self->getParent->www_buildBadge(undef,'tokens');
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")));
$self->trash;
return $self->getParent->www_buildBadge(undef,'tokens');
}

6
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -937,7 +937,8 @@ sub www_getTicketsAsJson {
# looking for specific events
if ($keywords =~ m{^[\d+,*\s*]+$}) {
@ids = $db->buildArray("select distinct(EMSTicket.assetId) from EMSTicket left join asset using (assetId) where
asset.parentId=? and EMSTicket.eventNumber in (".$keywords.") order by EMSTicket.eventNumber",[$self->getId]);
asset.parentId=? and EMSTicket.eventNumber in (".$keywords.") and asset.state='published'
order by EMSTicket.eventNumber",[$self->getId]);
}
# looking for keywords
@ -951,7 +952,8 @@ sub www_getTicketsAsJson {
# just get all tickets
else {
@ids = $db->buildArray("select assetId from asset left join EMSTicket using (assetId) where parentId=? and className='WebGUI::Asset::Sku::EMSTicket' and revisionDate=(select max(revisionDate) from EMSTicket where assetId=asset.assetId) order by eventNumber", [$self->getId]);
@ids = $db->buildArray("select assetId from asset left join EMSTicket using (assetId) where parentId=? and
className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate=(select max(revisionDate) from EMSTicket where assetId=asset.assetId) order by eventNumber", [$self->getId]);
}
# get badge's badge groups