From 29e4effdb92e794690474ec9899b125025221ebf Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 28 Apr 2006 19:50:55 +0000 Subject: [PATCH] [ 1471218 ] 6.8.8: Unable to change Default Home Page --- docs/changelog/6.x.x.txt | 1 + lib/WebGUI/Form/Asset.pm | 4 ++- lib/WebGUI/Operation/FormHelpers.pm | 51 ++++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 5b51c20f0..3a5e24761 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -110,6 +110,7 @@ - added [ 1201811 ] resizable textAreas - added [ 1376374 ] WebGUI should return a Last-Modified http/1.x header - added [ 1216059 ] Admin Bar Made Sticky + - fix [ 1471218 ] 6.8.8: Unable to change Default Home Page - fix [ 1463411 ] Denied content not getting expired or trashed - fix [ 1461522 ] 6.8.7 Linking items in the page tree (PDF and other files) - fix [ 1465280 ] BR Tag in Outlook diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm index cbfc0a4f3..a4fc93e39 100644 --- a/lib/WebGUI/Form/Asset.pm +++ b/lib/WebGUI/Form/Asset.pm @@ -96,6 +96,8 @@ Renders an asset selector. sub toHtml { my $self = shift; my $asset = WebGUI::Asset->newByDynamicClass($self->session, $self->get("value")) || WebGUI::Asset->getRoot($self->session); + my $url = $asset->getUrl("op=formAssetTree;formId=".$self->get('id')); + $url .= ";classLimiter=".$self->get("class") if ($self->get("class")); return WebGUI::Form::Hidden->new($self->session, name=>$self->get("name"), extras=>$self->get("extras"), @@ -110,7 +112,7 @@ sub toHtml { )->toHtml .WebGUI::Form::Button->new($self->session, value=>"...", - extras=>'onclick="window.open(\''.$asset->getUrl("op=formAssetTree;classLimiter=".$self->get("class").";formId=".$self->get('id')).'\',\'assetPicker\',\'toolbar=no, location=no, status=no, directories=no, width=400, height=400\');"' + extras=>'onclick="window.open(\''.$url.'\',\'assetPicker\',\'toolbar=no, location=no, status=no, directories=no, width=400, height=400\');"' )->toHtml; } diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm index e5cff7e55..dbb09c1b2 100644 --- a/lib/WebGUI/Operation/FormHelpers.pm +++ b/lib/WebGUI/Operation/FormHelpers.pm @@ -41,24 +41,59 @@ sub www_formAssetTree { my @crumb; my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1}); foreach my $ancestor (@{$ancestors}) { - push(@crumb,'form->process("classLimiter").";formId=" - .$session->form->process("formId")).'">'.$ancestor->get("menuTitle").''); + my $url = $ancestor->getUrl("op=formAssetTree;formId=".$session->form->process("formId")); + $url .= ";classLimiter=".$session->form->process("classLimiter") if ($session->form->process("classLimiter")); + push(@crumb,''.$ancestor->get("menuTitle").''); } - my $output = '

'.join(" > ", @crumb)."

\n"; + my $output = ' + + +
+
'.join(" > ", @crumb)."

\n"; my $children = $base->getLineage(["children"],{returnObjects=>1}); my $i18n = WebGUI::International->new($session); + my $limit = $session->form->process("classLimiter"); foreach my $child (@{$children}) { next unless $child->canView; - if ($child->get("className") =~ /^$session->form->process("classLimiter")/) { - $output .= 'get("className") =~ /^$limit/) { + $output .= 'getId.'\';window.opener.document.getElementById(\''. $session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">['.$i18n->get("select").'] '; } else { - $output .= "[".$i18n->get("select")."] "; + $output .= '['.$i18n->get("select").'] '; } - $output .= 'form->process("classLimiter").";formId=" - .$session->form->process("formId")).'">'.$child->get("menuTitle").''."
\n"; + my $url = $child->getUrl("op=formAssetTree;formId=".$session->form->process("formId")); + $url .= ";classLimiter=".$session->form->process("classLimiter") if ($session->form->process("classLimiter")); + $output .= ''.$child->get("menuTitle").''."
\n"; } + $output .= '
'; $session->style->useEmptyStyle("1"); return $output; }