Final state and status fixes.

In these three files, any check for status=archived was removed, since
in each case it is possible that the Asset may want to be viewable
when it is archived, like Files, Posts, etc.
Updated Session/Url.t to remove tests for status=archived.
This commit is contained in:
Colin Kuskie 2007-11-22 18:46:17 +00:00
parent 865c1d315b
commit 256b52a0d7
4 changed files with 22 additions and 19 deletions

View file

@ -200,9 +200,14 @@ sub getBackToSiteURL {
my $media = WebGUI::Asset->getMedia($self->session);
my $mediaLineage = $media->get("lineage");
my $assetLineage = $self->session->asset->get("lineage");
if ($assetLineage =~ /^$importNodeLineage/ || $assetLineage eq "000001" || $assetLineage =~ /^$mediaLineage/ || ($self->session->asset->get("state") ne "published" && $self->session->asset->get("state") ne "archived")) {
if ( $assetLineage =~ /^$importNodeLineage/
|| $assetLineage eq "000001"
|| $assetLineage =~ /^$mediaLineage/
|| $self->session->asset->get("state") ne "published" ##Parent state is okay be definition
) {
$url = WebGUI::Asset->getDefault($self->session)->getUrl;
} else {
}
else {
$url = $self->session->asset->getContainer->getUrl;
}
} else {