oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes and added www_cleanup forced last step

Browse source
This commit is contained in:
Doug Bell 2010-04-30 12:27:16 -05:00
parent 8cc6ecb30d
commit fe97e9c510
4 changed files with 125 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/WebGUI/Wizard/HomePage.pm
View file

@ -20,7 +20,6 @@ sub _get_steps {
return [ qw(
pickStyle
chooseContent
finalize
)
];
}
@ -424,20 +423,5 @@ sub www_chooseContentSave {
return;
} ## end sub www_chooseContentSave
#----------------------------------------------------------------------------
=head2 www_finalize ( $output )
Redirect the user to to the home page
=cut
sub www_finalize {
my ($self) = @_;
my $session = $self->session;
$session->http->setCacheControl("none");
$session->http->setRedirect( $session->url->gateway );
return "redirect";
}
1;

32
lib/WebGUI/Wizard/Setup.pm
View file

@ -22,7 +22,6 @@ sub _get_steps {
companyInformation
siteStats
defaultStyle
finalize
)];
}
@ -375,19 +374,20 @@ sub www_defaultStyleSave {
#----------------------------------------------------------------------------
=head2 www_finalize ( )
=head2 www_cleanup ( )
Give the user a choice to do the Home Page wizard
=cut
sub www_finalize {
sub www_cleanup {
my ( $self ) = @_;
my $session = $self->session;
my $form = $session->form;
$session->http->setCacheControl("none");
my $i18n = WebGUI::International->new( $session, "WebGUI" );
$self->cleanup;
# Delete specialState
$session->setting->remove( "specialState" );
@ -399,34 +399,18 @@ sub www_finalize {
$starterForm->hidden( name => "styleTemplateId", value => $self->get('styleTemplateId') );
$starterForm->submit( value => $i18n->get( 'yes please' ) );
my $finishForm = $self->getForm;
$finishForm->hidden( name => "runStarter", value => 0 );
$finishForm->submit( value => $i18n->get( 'no thanks' ) );
my $output = '<h1>' . $i18n->get('site starter title') . '</h1>';
$output .= ' <p>' . $i18n->get('site starter body') . '</p>'
. '<div style="float: left">' . $starterForm->print . '</div>'
. '<div style="float: left">' . $finishForm->print . '</div>'
. sprintf(
'<div style="float: left"><a href="%s">%s</a></div>',
$session->url->gateway,
$i18n->get('no thanks'),
)
. '<div style="clear: both">&nbsp;</div>'
;
return $output;
}
#----------------------------------------------------------------------------
=head2 www_finalizeSave ( )
User has declined to do the Home Page wizard
=cut
sub www_finalizeSave {
my ( $self ) = @_;
my $session = $self->session;
my ( $form ) = $session->quick(qw( form ));
$session->http->setRedirect( $session->url->gateway );
}
1;