diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 80956d32e..f14339f02 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1329,10 +1329,6 @@ sub getLineage { # based upon all available criteria, let's get some assets my $columns = "asset.assetId, asset.className, asset.parentId"; my $slavedb; - if ($rules->{returnQuickReadObjects}) { - $columns = "*"; - $slavedb = WebGUI::SQL->getSlave; - } my $sortOrder = ($rules->{invertTree}) ? "lineage desc" : "lineage asc"; if (exists $rules->{orderByClause}) { $sortOrder = $rules->{orderByClause}; @@ -1350,13 +1346,11 @@ sub getLineage { } else { $asset = WebGUI::Asset->newByDynamicClass($properties->{assetId}, $properties->{className}); } - } elsif ($rules->{returnQuickReadObjects}) { - $asset = WebGUI::Asset->newByPropertyHashRef($properties); } else { $asset = $properties->{assetId}; } # since we have the relatives info now, why not cache it - if ($rules->{returnObjects} || $rules->{returnQuickReadObjects}) { + if ($rules->{returnObjects}) { my $parent = $relativeCache{$properties->{parentId}}; $relativeCache{$properties->{assetId}} = $asset; $asset->{_parent} = $parent; @@ -3235,7 +3229,7 @@ sub www_manageAssets { WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.css', {rel=>"stylesheet",type=>"text/css"}); WebGUI::Style::setScript($session{config}{extrasURL}.'/assetManager/assetManager.js', {type=>"text/javascript"}); my $i18n = WebGUI::International->new("Asset"); - my $ancestors = $self->getLineage(["self","ancestors"],{returnQuickReadObjects=>1}); + my $ancestors = $self->getLineage(["self","ancestors"],{returnObjects=>1}); my @crumbtrail; foreach my $ancestor (@{$ancestors}) { push(@crumbtrail,''.$ancestor->getTitle.''); diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index 66bcfa5c7..ed2f89c82 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -109,7 +109,7 @@ sub getEditForm { ); } else { my @assetsToHide = split("\n",$self->getValue("assetsToHide")); - my $children = $self->getLineage(["children"],{"returnQuickReadObjects"=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"]}); + my $children = $self->getLineage(["children"],{"returnObjects"=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"]}); my %childIds; foreach my $child (@{$children}) { $childIds{$child->getId} = $child->getTitle; diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index ff088fb6c..483e1e295 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -330,7 +330,7 @@ sub view { $start = $current unless (defined $start); # if none of the above results in a start point, then the current page must be it my @includedRelationships = split("\n",$self->get("assetsToInclude")); my %rules; - $rules{returnQuickReadObjects} = 1; + $rules{returnObjects} = 1; $rules{endingLineageLength} = $start->getLineageLength+$self->get("descendantEndPoint"); $rules{assetToPedigree} = $current if (isIn("pedigree",@includedRelationships)); $rules{ancestorLimit} = $self->get("ancestorEndPoint"); diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm index 4bde4b31f..10954db7b 100644 --- a/lib/WebGUI/Operation/FormHelpers.pm +++ b/lib/WebGUI/Operation/FormHelpers.pm @@ -20,13 +20,13 @@ use WebGUI::Style; sub www_formAssetTree { my $base = WebGUI::Asset->newByUrl || WebGUI::Asset->getRoot; my @crumb; - my $ancestors = $base->getLineage(["self","ancestors"],{returnQuickReadObjects=>1}); + my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1}); foreach my $ancestor (@{$ancestors}) { push(@crumb,''.$ancestor->get("menuTitle").''); } my $output = '
'.join(" > ", @crumb)."
\n"; - my $children = $base->getLineage(["children"],{returnQuickReadObjects=>1}); + my $children = $base->getLineage(["children"],{returnObjects=>1}); foreach my $child (@{$children}) { next unless $child->canView; if ($child->get("className") =~ /^$session{form}{classLimiter}/) { @@ -81,12 +81,12 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url"