From 4210b64369aa2b6ebf116a632a314bfb2cf3c1f3 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Wed, 4 Aug 2010 14:28:59 -0500 Subject: [PATCH] ExportHtml AssetHelper works --- lib/WebGUI/AssetHelper/ExportHtml.pm | 71 ++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/lib/WebGUI/AssetHelper/ExportHtml.pm b/lib/WebGUI/AssetHelper/ExportHtml.pm index bf4948242..e5251cd66 100644 --- a/lib/WebGUI/AssetHelper/ExportHtml.pm +++ b/lib/WebGUI/AssetHelper/ExportHtml.pm @@ -51,7 +51,7 @@ sub process { } return { - open_tab => $asset->getUrl('op=assetHelper;className=WebGUI::AssetHelper::Export;func=editBranch'), + openDialog => '?op=assetHelper;className=' . $class . ';method=export;assetId=' . $asset->getId, }; } @@ -67,10 +67,24 @@ sub www_export { my ($class, $asset) = @_; my $session = $asset->session; return $session->privilege->insufficient() unless ($session->user->isInGroup(13)); + my ( $style, $url ) = $session->quick(qw{ style url }); + $style->setLink( $url->extras('hoverhelp.css'), { rel => "stylesheet", type => "text/css" } ); + $style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js') ); + $style->setScript( $url->extras('yui/build/container/container-min.js') ); + $style->setScript( $url->extras('hoverhelp.js') ); + $style->setRawHeadTags( <<'ENDHTML' ); + +ENDHTML + my $i18n = WebGUI::International->new($session, "Asset"); my $f = WebGUI::HTMLForm->new($session, -action => $asset->getUrl); + $f->hidden( name => 'op', value => 'assetHelper' ); + $f->hidden( name => 'className', value => $class ); + $f->hidden( name => 'assetId', value => $asset->getId ); $f->hidden( - name => "func", + name => "method", value => "exportStatus" ); $f->integer( @@ -125,7 +139,10 @@ sub www_export { if($@) { $message = $@; } - return $message . $f->print; + return $session->style->process( + $message . $f->print, + "PBtmpl0000000000000137" + ); } @@ -142,13 +159,49 @@ sub www_exportStatus { my $session = $asset->session; return $session->privilege->insufficient() unless ($session->user->isInGroup(13)); my $i18n = WebGUI::International->new($session, "Asset"); - my $iframeUrl = $asset->getUrl('func=exportGenerate'); - foreach my $formVar (qw/index depth userId extrasUploadsAction rootUrlAction exportUrl/) { - $iframeUrl = $session->url->append($iframeUrl, $formVar . '=' . $session->form->process($formVar)); - } + my $pb = WebGUI::ProgressBar->new( $session ); - my $output = ''; - return $output; + my $i18n = WebGUI::International->new($session, 'Asset'); + my $args = { + quiet => 1, # We'll wrap subs to update the ProgressBar + userId => $session->form->process('userId'), + indexFileName => $session->form->process('index'), + extrasUploadAction => $session->form->process('extrasUploadsAction'), + rootUrlAction => $session->form->process('rootUrlAction'), + depth => $session->form->process('depth'), + exportUrl => $session->form->process('exportUrl'), + }; + + return $session->response->stream( sub { + my ( $session ) = @_; + return $pb->run( + admin => 1, + title => $i18n->get('edit branch'), + icon => $session->url->extras('adminConsole/assets.gif'), + code => sub { + my ( $bar ) = @_; + $bar->update( 'Preparing...' ); + $bar->total( $asset->getDescendantCount ); + $bar->update( 'Asset ID ' . $asset->getId ); + + my $message; + eval { + $message = $asset->exportAsHtml( $args ); + }; + if ( $@ ) { + return { error => "$@" }; + } + return { message => $message || "Export successful!" }; + }, + wrap => { + 'WebGUI::Asset::exportWriteFile' => sub { + my ($bar, $original, $asset, @args) = @_; + $bar->update( "Exporting " . $asset->getTitle ); + return $asset->$original(@args); + }, + }, + ); + } ); } 1;