bug fixes for widgets and exports. snippets were exported as index.html or the

like, and widget toolboxes weren't popping up in a widgetized view.
This commit is contained in:
Chris Nehren 2008-05-31 19:42:38 +00:00
parent f5ad94c95e
commit 5dfc9e3bfc
8 changed files with 774 additions and 142 deletions

View file

@ -205,6 +205,7 @@ sub exportAsHtml {
my $indexFileName = $args->{indexFileName};
my $extrasUploadAction = $args->{extrasUploadAction};
my $rootUrlAction = $args->{rootUrlAction};
my $exportUrl = $args->{exportUrl};
# if we're doing symlinking of the root URL, then the current default asset
# is the root of the tree. take down that asset ID so we can pass it to
@ -282,8 +283,12 @@ sub exportAsHtml {
return ($returnCode, $message);
}
my $exportedCount = 0;
foreach my $assetId ( @{$assetIds} ) {
# set a scratch variable for widgets to know we're exporting
$exportSession->scratch->set('exportUrl', $exportUrl);
my $asset = WebGUI::Asset->newByDynamicClass($exportSession, $assetId);
my $fullPath = $asset->exportGetUrlAsPath;
@ -500,6 +505,10 @@ Translates a URL into an appropriate path and filename for exporting. For
example, given C<'/foo/bar/baz'>, will return C<'/foo/bar/baz/index.html'>
provided the value of indexFile as given to exportAsHtml was C<'index.html'>.
=head3 url
URL of the asset we need an export path for
=head3 index
index filename passed from L</exportAsHtml>
@ -815,6 +824,11 @@ sub www_export {
-name => "index",
-value => "index.html"
);
$f->text(
-label => 'Export site root URL',
-name => 'exportUrl',
-value => '',
);
# TODO: maybe add copy options to these boxes alongside symlink
$f->selectBox(
@ -858,7 +872,7 @@ sub www_exportStatus {
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(13));
my $i18n = WebGUI::International->new($self->session, "Asset");
my $iframeUrl = $self->getUrl('func=exportGenerate');
foreach my $formVar (qw/index depth userId extrasUploadsAction rootUrlAction/) {
foreach my $formVar (qw/index depth userId extrasUploadsAction rootUrlAction exportUrl/) {
$iframeUrl = $self->session->url->append($iframeUrl, $formVar . '=' . $self->session->form->process($formVar));
}
@ -893,6 +907,7 @@ sub www_exportGenerate {
extrasUploadAction => $self->session->form->process('extrasUploadsAction'),
rootUrlAction => $self->session->form->process('rootUrlAction'),
depth => $self->session->form->process('depth'),
exportUrl => $self->session->form->process('exportUrl'),
});
if (!$success) {
$self->session->output->print($description, 1);