removed quick read
This commit is contained in:
parent
3d12d52a8e
commit
f4db3c907c
4 changed files with 10 additions and 16 deletions
|
|
@ -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,'<a href="'.$ancestor->getUrl("func=manageAssets").'">'.$ancestor->getTitle.'</a>');
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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,'<a href="'.$ancestor->getUrl("op=formAssetTree&classLimiter=".$session{form}{classLimiter}."&formId="
|
||||
.$session{form}{formId}).'">'.$ancestor->get("menuTitle").'</a>');
|
||||
}
|
||||
my $output = '<p>'.join(" > ", @crumb)."</p>\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"
|
|||
</script><fieldset><legend>Pages</legend> ';
|
||||
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,'<a href="'.$ancestor->getUrl("op=richEditPageTree").'">'.$ancestor->get("menuTitle").'</a>');
|
||||
}
|
||||
$output .= '<p>'.join(" > ", @crumb)."</p>\n";
|
||||
my $children = $base->getLineage(["children"],{returnQuickReadObjects=>1});
|
||||
my $children = $base->getLineage(["children"],{returnObjects=>1});
|
||||
foreach my $child (@{$children}) {
|
||||
next unless $child->canView;
|
||||
$output .= '<a href="#" onclick="document.getElementById(\'url\').value=\''.$child->get("url").'\'">(•)</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";
|
||||
|
|
@ -101,12 +101,12 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url"
|
|||
sub www_richEditImageTree {
|
||||
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,'<a href="'.$ancestor->getUrl("op=richEditImageTree").'">'.$ancestor->get("menuTitle").'</a>');
|
||||
}
|
||||
my $output = '<p>'.join(" > ", @crumb)."</p>\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") =~ /^WebGUI::Asset::File::Image/) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue