Merge branch 'WebGUI8' into psgi

This commit is contained in:
Graham Knop 2010-05-10 17:03:17 -05:00
commit 65dfb6e683
36 changed files with 378 additions and 741 deletions

View file

@ -63,6 +63,7 @@ use Archive::Any;
=head1 DIAGNOSTICS
=head1 METHODS
=cut
#----------------------------------------------------------------------------

View file

@ -306,7 +306,7 @@ sub getFolder {
$oldVersionTag->setWorking() if $oldVersionTag;
##Get a new version of the asset from the db with the correct state
$folder = WebGUI::Asset->newByUrl($session, $folderUrl);
$folder = $folder->cloneFromDb();
return $folder;
}

View file

@ -1975,7 +1975,7 @@ sub prepareShowSurveyTemplate {
Serializes the SurveyJSON instance and persists it to the database.
Calling this method is only required if you have directly accessed and modified
the L<"surveyJSON"> object.
the L<WebGUI::Asset::Wobject::Survey::surveyJSON> object.
=cut