From 814c2af249bb5a922edc91480148fbb7e8d106b8 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 3 Mar 2010 16:27:45 -0800 Subject: [PATCH] Change calls to new to newById across Asset/ --- lib/WebGUI/Asset/Event.pm | 6 +-- lib/WebGUI/Asset/File.pm | 2 +- lib/WebGUI/Asset/File/GalleryFile.pm | 4 +- lib/WebGUI/Asset/MatrixListing.pm | 2 +- lib/WebGUI/Asset/Post.pm | 4 +- lib/WebGUI/Asset/Post/Thread.pm | 2 +- lib/WebGUI/Asset/RichEdit.pm | 2 +- lib/WebGUI/Asset/Shortcut.pm | 2 +- lib/WebGUI/Asset/Sku/Ad.pm | 4 +- lib/WebGUI/Asset/Sku/Donation.pm | 2 +- lib/WebGUI/Asset/Sku/EMSBadge.pm | 2 +- lib/WebGUI/Asset/Sku/EMSTicket.pm | 2 +- lib/WebGUI/Asset/Sku/FlatDiscount.pm | 2 +- lib/WebGUI/Asset/Sku/Product.pm | 2 +- lib/WebGUI/Asset/Sku/Subscription.pm | 2 +- lib/WebGUI/Asset/Sku/ThingyRecord.pm | 2 +- lib/WebGUI/Asset/Story.pm | 2 +- lib/WebGUI/Asset/Template.pm | 2 +- lib/WebGUI/Asset/WikiPage.pm | 2 +- lib/WebGUI/Asset/Wobject/Article.pm | 2 +- lib/WebGUI/Asset/Wobject/Calendar.pm | 2 +- lib/WebGUI/Asset/Wobject/Carousel.pm | 2 +- lib/WebGUI/Asset/Wobject/DataForm.pm | 4 +- lib/WebGUI/Asset/Wobject/DataTable.pm | 2 +- .../Asset/Wobject/EventManagementSystem.pm | 38 +++++++++---------- lib/WebGUI/Asset/Wobject/Folder.pm | 2 +- lib/WebGUI/Asset/Wobject/Gallery.pm | 6 +-- lib/WebGUI/Asset/Wobject/GalleryAlbum.pm | 8 ++-- lib/WebGUI/Asset/Wobject/HttpProxy.pm | 2 +- lib/WebGUI/Asset/Wobject/InOutBoard.pm | 2 +- lib/WebGUI/Asset/Wobject/Map.pm | 6 +-- lib/WebGUI/Asset/Wobject/Matrix.pm | 4 +- lib/WebGUI/Asset/Wobject/MessageBoard.pm | 2 +- lib/WebGUI/Asset/Wobject/MultiSearch.pm | 2 +- lib/WebGUI/Asset/Wobject/Navigation.pm | 2 +- lib/WebGUI/Asset/Wobject/Poll.pm | 2 +- lib/WebGUI/Asset/Wobject/ProjectManager.pm | 2 +- lib/WebGUI/Asset/Wobject/SQLReport.pm | 2 +- lib/WebGUI/Asset/Wobject/Search.pm | 4 +- lib/WebGUI/Asset/Wobject/Shelf.pm | 2 +- lib/WebGUI/Asset/Wobject/StockData.pm | 2 +- lib/WebGUI/Asset/Wobject/StoryArchive.pm | 6 +-- lib/WebGUI/Asset/Wobject/StoryTopic.pm | 8 ++-- .../Asset/Wobject/Survey/ExpressionEngine.pm | 2 +- lib/WebGUI/Asset/Wobject/Survey/Test.pm | 2 +- lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 2 +- lib/WebGUI/Asset/Wobject/Thingy.pm | 4 +- lib/WebGUI/Asset/Wobject/TimeTracking.pm | 2 +- lib/WebGUI/Asset/Wobject/UserList.pm | 2 +- lib/WebGUI/Asset/Wobject/WeatherData.pm | 2 +- lib/WebGUI/Asset/Wobject/WikiMaster.pm | 10 ++--- lib/WebGUI/Asset/Wobject/_NewWobject.skeleton | 2 +- .../Wobject/_NewWobject.skeleton.minimal | 2 +- lib/WebGUI/Asset/_NewAsset.skeleton | 2 +- lib/WebGUI/Asset/_NewAsset.skeleton.minimal | 2 +- 55 files changed, 98 insertions(+), 98 deletions(-) diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 7914c0fc2..a8318ea00 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -1484,7 +1484,7 @@ sub prepareView { $templateId = "CalendarEvent000000001"; } - my $template = WebGUI::Asset::Template->new($self->session,$templateId); + my $template = WebGUI::Asset::Template->newById($self->session,$templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; @@ -2479,11 +2479,11 @@ ENDJS my $template; if ($parent) { $template - = WebGUI::Asset::Template->new($session,$parent->templateIdEventEdit); + = WebGUI::Asset::Template->newById($session,$parent->templateIdEventEdit); } else { $template - = WebGUI::Asset::Template->new($session,"CalendarEventEdit00001"); + = WebGUI::Asset::Template->newById($session,"CalendarEventEdit00001"); } diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index e573b2180..203fe6507 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -375,7 +375,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm index 20dbd5379..e94ef8d1a 100644 --- a/lib/WebGUI/Asset/File/GalleryFile.pm +++ b/lib/WebGUI/Asset/File/GalleryFile.pm @@ -386,7 +386,7 @@ sub getCurrentRevisionDate { return undef unless $revisionDate; - my $asset = WebGUI::Asset->new( $session, $assetId, $class, $revisionDate ); + my $asset = WebGUI::Asset->newById( $session, $assetId, $revisionDate ); return undef unless $asset; @@ -583,7 +583,7 @@ sub prepareView { $self->SUPER::prepareView(); my $template - = WebGUI::Asset::Template->new($self->session, $self->getGallery->templateIdViewFile); + = WebGUI::Asset::Template->newById($self->session, $self->getGallery->templateIdViewFile); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index 6b8aacc94..d8db8d17f 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -474,7 +474,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->next::method(); - my $template = WebGUI::Asset::Template->new($self->session, $self->getParent->get('detailTemplateId')); + my $template = WebGUI::Asset::Template->newById($self->session, $self->getParent->get('detailTemplateId')); $template->prepare; $self->{_viewTemplate} = $template; return undef; diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 61f698570..e5f09474f 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -786,7 +786,7 @@ sub getThread { $threadId=$self->getParent->threadId; } } - $self->{_thread} = WebGUI::Asset::Post::Thread->new($self->session, $threadId); + $self->{_thread} = WebGUI::Asset::Post::Thread->newById($self->session, $threadId); } return $self->{_thread}; } @@ -1786,7 +1786,7 @@ sub www_showConfirmation { $collabSystem = $parent->getParent; } my $templateId = $collabSystem->postReceivedTemplateId; - my $template = WebGUI::Asset->new($self->session, $templateId); + my $template = WebGUI::Asset->newById($self->session, $templateId); my %var = ( url => $url, ); diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index afc82853f..bd6402aa9 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -644,7 +644,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->newByid($self->session, $self->getParent->threadTemplateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->getParent->threadTemplateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index 12209c89f..16b22e7f7 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -460,7 +460,7 @@ my $sql = "select asset.assetId, assetData.revisionDate from RichEdit left join my %richEditors; tie %richEditors, 'Tie::IxHash'; while (my ($id, $version) = $sth->array) { - $richEditors{$id} = WebGUI::Asset::RichEdit->new($session, $id, undef, $version)->getTitle; + $richEditors{$id} = WebGUI::Asset::RichEdit->newById($session, $id, $version)->getTitle; } $sth->finish; return \%richEditors; diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 005bf3d9a..ea56b09f5 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -809,7 +809,7 @@ on the Asset that is shortcutted. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId")); + my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId")); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; my $shortcut = $self->getShortcut; diff --git a/lib/WebGUI/Asset/Sku/Ad.pm b/lib/WebGUI/Asset/Sku/Ad.pm index 027a7b9d1..b0e24fc45 100644 --- a/lib/WebGUI/Asset/Sku/Ad.pm +++ b/lib/WebGUI/Asset/Sku/Ad.pm @@ -418,7 +418,7 @@ sub prepareManage { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->manageTemplate; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } @@ -435,7 +435,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->purchaseTemplate; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/Donation.pm b/lib/WebGUI/Asset/Sku/Donation.pm index d21dd41dd..371b3e7fd 100644 --- a/lib/WebGUI/Asset/Sku/Donation.pm +++ b/lib/WebGUI/Asset/Sku/Donation.pm @@ -139,7 +139,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->templateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/EMSBadge.pm b/lib/WebGUI/Asset/Sku/EMSBadge.pm index 69a5955e7..ec5f34874 100644 --- a/lib/WebGUI/Asset/Sku/EMSBadge.pm +++ b/lib/WebGUI/Asset/Sku/EMSBadge.pm @@ -330,7 +330,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->templateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/EMSTicket.pm b/lib/WebGUI/Asset/Sku/EMSTicket.pm index 871229bc1..9a97e8ce6 100644 --- a/lib/WebGUI/Asset/Sku/EMSTicket.pm +++ b/lib/WebGUI/Asset/Sku/EMSTicket.pm @@ -329,7 +329,7 @@ sub getPrice { my $badgeId = $self->getOptions->{badgeId}; my $ribbonId = $self->session->db->quickScalar("select ribbonAssetId from EMSRegistrantRibbon where badgeId=? limit 1",[$badgeId]); if (defined $ribbonId && isIn($ribbonId, @ribbonIds)) { - my $ribbon = WebGUI::Asset->new($self->session,$ribbonId,'WebGUI::Asset::Sku::EMSRibbon'); + my $ribbon = WebGUI::Asset->newById($self->session, $ribbonId); $discount = $ribbon->percentageDiscount; } else { diff --git a/lib/WebGUI/Asset/Sku/FlatDiscount.pm b/lib/WebGUI/Asset/Sku/FlatDiscount.pm index e2a727746..79f8a804e 100644 --- a/lib/WebGUI/Asset/Sku/FlatDiscount.pm +++ b/lib/WebGUI/Asset/Sku/FlatDiscount.pm @@ -194,7 +194,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->templateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm index 12efe3149..94fe766e8 100644 --- a/lib/WebGUI/Asset/Sku/Product.pm +++ b/lib/WebGUI/Asset/Sku/Product.pm @@ -732,7 +732,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId")); + my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId")); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/Subscription.pm b/lib/WebGUI/Asset/Sku/Subscription.pm index 4305d060b..f8aa36357 100644 --- a/lib/WebGUI/Asset/Sku/Subscription.pm +++ b/lib/WebGUI/Asset/Sku/Subscription.pm @@ -481,7 +481,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $templateId = $self->templateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm index 457631406..d2d06c2b2 100644 --- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm +++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm @@ -465,7 +465,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->templateIdView ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->templateIdView ); $template->prepare( $self->getMetaDataAsTemplateVariables ); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm index 673c80f57..25830946d 100644 --- a/lib/WebGUI/Asset/Story.pm +++ b/lib/WebGUI/Asset/Story.pm @@ -552,7 +552,7 @@ sub prepareView { else { $templateId = $self->getArchive->storyTemplateId; } - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare; $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm index 763003a2c..646cd8571 100644 --- a/lib/WebGUI/Asset/Template.pm +++ b/lib/WebGUI/Asset/Template.pm @@ -434,7 +434,7 @@ sub getList { my %templates; tie %templates, 'Tie::IxHash'; TEMPLATE: while (my ($id, $version) = $sth->array) { - my $template = eval { WebGUI::Asset::Template->new($session,$id,$version); }; + my $template = eval { WebGUI::Asset::Template->newById($session,$id,$version); }; next TEMPLATE if Exception::Class->caught(); $templates{$id} = $template->getTitle; } diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm index 79a6708bf..995d774d5 100644 --- a/lib/WebGUI/Asset/WikiPage.pm +++ b/lib/WebGUI/Asset/WikiPage.pm @@ -356,7 +356,7 @@ sub preparePageTemplate { my $self = shift; return $self->{_pageTemplate} if $self->{_pageTemplate}; $self->{_pageTemplate} = - WebGUI::Asset::Template->new($self->session, $self->getWiki->pageTemplateId); + WebGUI::Asset::Template->newById($self->session, $self->getWiki->pageTemplateId); $self->{_pageTemplate}->prepare; return $self->{_pageTemplate}; } diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm index 6066a7b98..39949270a 100644 --- a/lib/WebGUI/Asset/Wobject/Article.pm +++ b/lib/WebGUI/Asset/Wobject/Article.pm @@ -228,7 +228,7 @@ sub prepareView { if ($self->session->form->process("overrideTemplateId") ne "") { $templateId = $self->session->form->process("overrideTemplateId"); } - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index f433b361a..56f5d1a6c 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -990,7 +990,7 @@ sub prepareView { #$self->session->errorHandler->warn("Prepare view ".$view." with template ".$self->get("templateId".$view)); - my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId".$view)); + my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId".$view)); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm index 4f39d462c..63937e899 100644 --- a/lib/WebGUI/Asset/Wobject/Carousel.pm +++ b/lib/WebGUI/Asset/Wobject/Carousel.pm @@ -140,7 +140,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 55f370c91..1a8bb4b17 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -1174,7 +1174,7 @@ Like prepareView, but for the list view of the template. sub prepareViewList { my $self = shift; my $templateId = $self->listTemplateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -1213,7 +1213,7 @@ sub prepareViewForm { $self->session->style->setLink($self->session->url->extras('tabs/tabs.css'), {"type"=>"text/css"}); $self->session->style->setScript($self->session->url->extras('tabs/tabs.js'), {"type"=>"text/javascript"}); my $templateId = $self->templateId; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/DataTable.pm b/lib/WebGUI/Asset/Wobject/DataTable.pm index 583c87d94..29e032e08 100644 --- a/lib/WebGUI/Asset/Wobject/DataTable.pm +++ b/lib/WebGUI/Asset/Wobject/DataTable.pm @@ -207,7 +207,7 @@ sub prepareView { $self->{_datatable} = $dt; # Prepare the template - my $template = WebGUI::Asset::Template->new( $session, $self->templateId ); + my $template = WebGUI::Asset::Template->newById( $session, $self->templateId ); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index e2ad52000..4fe57017b 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -411,7 +411,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -501,7 +501,7 @@ sub www_addRibbonToBadge { my $session = $self->session; return $session->privilege->insufficient() unless $self->canView; my $form = $session->form; - my $ribbon = WebGUI::Asset->new($session, $form->get('assetId'), 'WebGUI::Asset::Sku::EMSRibbon'); + my $ribbon = WebGUI::Asset->newById($session, $form->get('assetId')); if (defined $ribbon) { $ribbon->addToCart({badgeId=>$form->get('badgeId')}); } @@ -523,7 +523,7 @@ sub www_addTicketsToBadge { my $form = $session->form; my @ids = $form->param('assetId'); foreach my $id (@ids) { - my $ticket = WebGUI::Asset->new($session, $id, 'WebGUI::Asset::Sku::EMSTicket'); + my $ticket = WebGUI::Asset->newById($session, $id); if (defined $ticket) { $ticket->addToCart({badgeId=>$form->get('badgeId')}); } @@ -544,7 +544,7 @@ sub www_addTokenToBadge { my $session = $self->session; return $session->privilege->insufficient() unless $self->canView; my $form = $session->form; - my $token = WebGUI::Asset->new($session, $form->get('assetId'), 'WebGUI::Asset::Sku::EMSToken'); + my $token = WebGUI::Asset->newById($session, $form->get('assetId')); if (defined $token) { my $item = $token->addToCart({badgeId=>$form->get('badgeId')}); $item->setQuantity($form->get('quantity')); @@ -857,7 +857,7 @@ sub www_exportEvents { # process events foreach my $id (@{$self->getTickets({returnIds=>1})}) { - my $event = WebGUI::Asset::Sku::EMSTicket->new($session, $id); + my $event = WebGUI::Asset::Sku::EMSTicket->newById($session, $id); my @export = (); if (defined $event) { my $metadata = $event->getEventMetaData; @@ -942,7 +942,7 @@ sub www_getRegistrantAsJson { # get badge info my $badgeInfo = $self->getRegistrant($badgeId); return "{}" unless (exists $badgeInfo->{badgeAssetId}); - my $badge = WebGUI::Asset::Sku::EMSBadge->new($session, $badgeInfo->{badgeAssetId}); + my $badge = WebGUI::Asset::Sku::EMSBadge->newById($session, $badgeInfo->{badgeAssetId}); $badgeInfo->{title} = $badge->getTitle; $badgeInfo->{sku} = $badge->sku; $badgeInfo->{assetId} = $badge->getId; @@ -951,7 +951,7 @@ sub www_getRegistrantAsJson { # get existing tickets my $existingTickets = $db->read("select ticketAssetId from EMSRegistrantTicket where badgeId=? and purchaseComplete=1",[$badgeId]); while (my ($id) = $existingTickets->array) { - my $ticket = WebGUI::Asset::Sku::EMSTicket->new($session, $id); + my $ticket = WebGUI::Asset::Sku::EMSTicket->newById($session, $id); my $startTime = WebGUI::DateTime->new($ticket->startDate)->set_time_zone($self->timezone); push(@tickets, { title => $ticket->getTitle, @@ -968,7 +968,7 @@ sub www_getRegistrantAsJson { # get existing ribbons my $existingRibbons = $db->read("select ribbonAssetId from EMSRegistrantRibbon where badgeId=?",[$badgeId]); while (my ($id) = $existingRibbons->array) { - my $ribbon = WebGUI::Asset::Sku::EMSRibbon->new($session, $id); + my $ribbon = WebGUI::Asset::Sku::EMSRibbon->newById($session, $id); push(@ribbons, { title => $ribbon->getTitle, hasPurchased => 1, @@ -980,7 +980,7 @@ sub www_getRegistrantAsJson { # get existing tokens my $existingTokens = $db->read("select tokenAssetId,quantity from EMSRegistrantToken where badgeId=?",[$badgeId]); while (my ($id, $quantity) = $existingTokens->array) { - my $token = WebGUI::Asset::Sku::EMSToken->new($session, $id); + my $token = WebGUI::Asset::Sku::EMSToken->newById($session, $id); push(@tokens, { title => $token->getTitle, hasPurchased => 1, @@ -1094,7 +1094,7 @@ sub www_getRegistrantsAsJson { $results{'recordsReturned'} = $badges->rows()+0; $results{'totalRecords'} = $db->quickScalar('select found_rows()') + 0; ##Convert to numeric while (my $badgeInfo = $badges->hashRef) { - my $badge = WebGUI::Asset::Sku::EMSBadge->new($session, $badgeInfo->{badgeAssetId}); + my $badge = WebGUI::Asset::Sku::EMSBadge->newById($session, $badgeInfo->{badgeAssetId}); unless (defined $badge) { $session->log->error('badge '.$badgeInfo->{badgeAssetId}.' does not exist.'); next; @@ -1307,7 +1307,7 @@ className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate my @badgeGroups = (); if (defined $badgeId) { my $assetId = $db->quickScalar("select badgeAssetId from EMSRegistrant where badgeId=?",[$badgeId]); - my $badge = WebGUI::Asset->new($session, $assetId, 'WebGUI::Asset::Sku::EMSBadge'); + my $badge = WebGUI::Asset->newById($session, $assetId); @badgeGroups = split("\n",$badge->relatedBadgeGroups) if (defined $badge); } @@ -1326,7 +1326,7 @@ className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate next; } - my $ticket = WebGUI::Asset->new($session, $id, 'WebGUI::Asset::Sku::EMSTicket'); + my $ticket = WebGUI::Asset->newById($session, $id); # skip borked tickets unless (defined $ticket) { @@ -1577,7 +1577,7 @@ $|=1; $out->print("Processing ".join(",", @row)."\n",1); my $event = undef; if (defined $assetIdIndex) { - $event = WebGUI::Asset::Sku::EMSTicket->new($session, $row[$assetIdIndex]); + $event = WebGUI::Asset::Sku::EMSTicket->newById($session, $row[$assetIdIndex]); } if (defined $event) { $out->print('Updating '.$event->getId."\n",1); @@ -1856,7 +1856,7 @@ sub www_manageRegistrant { } # badge management - my $badge = WebGUI::Asset::Sku::EMSBadge->new($session, $registrant->{badgeAssetId}); + my $badge = WebGUI::Asset::Sku::EMSBadge->newById($session, $registrant->{badgeAssetId}); $output .= q|

|.$badge->getTitle.q|
|.$i18n->get('print').q| • |.$i18n->get('refund').q| @@ -1874,7 +1874,7 @@ sub www_manageRegistrant { # ticket management my $existingTickets = $db->read("select ticketAssetId, transactionItemId from EMSRegistrantTicket where badgeId=? and purchaseComplete=1",[$badgeId]); while (my ($id, $itemId) = $existingTickets->array) { - my $ticket = WebGUI::Asset::Sku::EMSTicket->new($session, $id); + my $ticket = WebGUI::Asset::Sku::EMSTicket->newById($session, $id); $output .= q|

|.$ticket->getTitle.q|
|.$i18n->get('print').q| • |.$i18n->get('refund').q| @@ -1884,7 +1884,7 @@ sub www_manageRegistrant { # ribbon management my $existingRibbons = $db->read("select ribbonAssetId, transactionItemId from EMSRegistrantRibbon where badgeId=?",[$badgeId]); while (my ($id, $itemId) = $existingRibbons->array) { - my $ribbon = WebGUI::Asset::Sku::EMSRibbon->new($session, $id); + my $ribbon = WebGUI::Asset::Sku::EMSRibbon->newById($session, $id); $output .= q|

|.$ribbon->getTitle.q|
|.$i18n->get('refund').q|


|; @@ -1893,7 +1893,7 @@ sub www_manageRegistrant { # token management my $existingTokens = $db->read("select tokenAssetId,quantity,transactionItemIds from EMSRegistrantToken where badgeId=?",[$badgeId]); while (my ($id, $quantity, $itemIds) = $existingTokens->array) { - my $token = WebGUI::Asset::Sku::EMSToken->new($session, $id); + my $token = WebGUI::Asset::Sku::EMSToken->newById($session, $id); my @itemIds = split(',', $itemIds); $output .= q|

|.$token->getTitle.q| (|.$quantity.q|)
|.$i18n->get('refund').q| @@ -1962,7 +1962,7 @@ sub www_printBadge { return $session->privilege->insufficient unless ($self->isRegistrationStaff); my $form = $session->form; my $registrant = $self->getRegistrant($form->get('badgeId')); - my $badge = WebGUI::Asset::Sku::EMSBadge->new($session, $registrant->{badgeAssetId}); + my $badge = WebGUI::Asset::Sku::EMSBadge->newById($session, $registrant->{badgeAssetId}); $registrant->{badgeTitle} = $badge->getTitle; return $self->processTemplate($registrant,$self->printBadgeTemplateId); } @@ -1981,7 +1981,7 @@ sub www_printTicket { return $session->privilege->insufficient unless ($self->isRegistrationStaff); my $form = $session->form; my $registrant = $self->getRegistrant($form->get('badgeId')); - my $ticket = WebGUI::Asset::Sku::EMSTicket->new($session, $form->get('ticketAssetId')); + my $ticket = WebGUI::Asset::Sku::EMSTicket->newById($session, $form->get('ticketAssetId')); $registrant->{ticketTitle} = $ticket->getTitle; my $startTime = WebGUI::DateTime->new($ticket->startDate)->set_time_zone($self->timezone); $registrant->{ticketStart} = $startTime->strftime('%F %R'); diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index eed74c050..9889b55c2 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -165,7 +165,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Gallery.pm b/lib/WebGUI/Asset/Wobject/Gallery.pm index a74bb45a3..c60394db4 100644 --- a/lib/WebGUI/Asset/Wobject/Gallery.pm +++ b/lib/WebGUI/Asset/Wobject/Gallery.pm @@ -999,7 +999,7 @@ Prepare the template for listing multiple albums. sub prepareViewListAlbums { my $self = shift; my $template - = WebGUI::Asset::Template->new($self->session, $self->templateIdListAlbums); + = WebGUI::Asset::Template->newById($self->session, $self->templateIdListAlbums); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -1204,7 +1204,7 @@ sub www_listAlbumsRss { my $var = $self->getTemplateVars; for my $assetId ( @{ $self->getAlbumIds } ) { - my $asset = WebGUI::Asset->new( $session, $assetId, 'WebGUI::Asset::Wobject::GalleryAlbum'); + my $asset = WebGUI::Asset->newById( $session, $assetId); my $assetVar = $asset->getTemplateVars; # Fix URLs @@ -1332,7 +1332,7 @@ sub www_listAlbumsService { if ($count > $pageNumber * 100 - 1) { # skip high page numbers last; } - my $asset = WebGUI::Asset->new( $session, $assetId, 'WebGUI::Asset::Wobject::GalleryAlbum' ); + my $asset = WebGUI::Asset->newById( $session, $assetId); if (defined $asset) { if ($asset->canView) { push @assets, { diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm index c46f4c9f8..ccd948172 100644 --- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm +++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm @@ -376,7 +376,7 @@ sub getCurrentRevisionDate { return undef unless $revisionDate; - my $asset = WebGUI::Asset->new( $session, $assetId, $class, $revisionDate ); + my $asset = WebGUI::Asset->newById( $session, $assetId, $revisionDate ); return undef unless $asset; @@ -663,7 +663,7 @@ sub prepareView { my $templateId = $self->getParent->templateIdViewAlbum; my $template - = WebGUI::Asset::Template->new($self->session, $templateId); + = WebGUI::Asset::Template->newById($self->session, $templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -1337,7 +1337,7 @@ sub www_slideshow { $self->appendTemplateVarsFileLoop( $self->{_templateVars}, $self->getFileIds ); my $templateId = $self->getParent->templateIdViewSlideshow; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_preparedTemplate} = $template; @@ -1360,7 +1360,7 @@ sub www_thumbnails { $self->appendTemplateVarsFileLoop($self->{_templateVars}, $self->getFileIds); my $templateId = $self->getParent->templateIdViewThumbnails; - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_preparedTemplate} = $template; diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index aab5a353d..0f223d6e5 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -226,7 +226,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm index 0a5bf5496..56ad720b0 100644 --- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm +++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm @@ -117,7 +117,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->inOutTemplateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->inOutTemplateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm index 69ab6661b..c04c9749f 100644 --- a/lib/WebGUI/Asset/Wobject/Map.pm +++ b/lib/WebGUI/Asset/Wobject/Map.pm @@ -226,7 +226,7 @@ sub getEditPointTemplate { if ( !$self->{_editPointTemplate} ) { my $templateId = $self->templateIdEditPoint; my $template - = WebGUI::Asset::Template->new( $self->session, $templateId ); + = WebGUI::Asset::Template->newById( $self->session, $templateId ); $template->prepare; $self->{_editPointTemplate} = $template; } @@ -249,7 +249,7 @@ sub getViewPointTemplate { if ( !$self->{_viewPointTemplate} ) { my $templateId = $self->templateIdViewPoint; my $template - = WebGUI::Asset::Template->new( $self->session, $templateId ); + = WebGUI::Asset::Template->newById( $self->session, $templateId ); $self->{_viewPointTemplate} = $template; } @@ -319,7 +319,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->templateIdView ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->templateIdView ); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index f5d92ff21..ef16e77fc 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -569,7 +569,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -1263,7 +1263,7 @@ sub www_getCompareListData { foreach my $listingId (@listingIds){ $listingId =~ s/_____/-/g; - my $listing = WebGUI::Asset::MatrixListing->new($session,$listingId); + my $listing = WebGUI::Asset::MatrixListing->newById($session,$listingId); $listing->incrementCounter("compares"); my $listingId_safe = $listingId; $listingId_safe =~ s/-/_____/g; diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm index 61632e003..79a95f890 100644 --- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm @@ -51,7 +51,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm index 1a1e77969..d668f557c 100644 --- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm +++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm @@ -62,7 +62,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index 2f6f92557..ee999295a 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -357,7 +357,7 @@ Extend the superclass to add metadata and to preprocess the template. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId")); + my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId")); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm index 48c1a3a65..86c705090 100644 --- a/lib/WebGUI/Asset/Wobject/Poll.pm +++ b/lib/WebGUI/Asset/Wobject/Poll.pm @@ -337,7 +337,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId")); + my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId")); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm index 515a152a4..fa4730997 100644 --- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm +++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm @@ -592,7 +592,7 @@ sub i18n { sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->projectDashboardTemplateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->projectDashboardTemplateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 1ae80d430..69cfcd6cf 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -525,7 +525,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Search.pm b/lib/WebGUI/Asset/Wobject/Search.pm index 070a1fc94..81a796b02 100644 --- a/lib/WebGUI/Asset/Wobject/Search.pm +++ b/lib/WebGUI/Asset/Wobject/Search.pm @@ -99,7 +99,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -179,7 +179,7 @@ sub view { || $user->isInGroup($data->{groupIdEdit}) ); - my $asset = WebGUI::Asset->new($session, $data->{assetId}, $data->{className}); + my $asset = WebGUI::Asset->newById($session, $data->{assetId}); if (defined $asset) { my $properties = $asset->get; if ($self->useContainers) { diff --git a/lib/WebGUI/Asset/Wobject/Shelf.pm b/lib/WebGUI/Asset/Wobject/Shelf.pm index 311ac48df..c733c6ab7 100644 --- a/lib/WebGUI/Asset/Wobject/Shelf.pm +++ b/lib/WebGUI/Asset/Wobject/Shelf.pm @@ -239,7 +239,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm index 127de76d5..1406964df 100644 --- a/lib/WebGUI/Asset/Wobject/StockData.pm +++ b/lib/WebGUI/Asset/Wobject/StockData.pm @@ -297,7 +297,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm index 80f8479f3..978083762 100644 --- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm +++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm @@ -238,7 +238,7 @@ sub exportAssetCollateral { limit => 50, ##This is based on the tagcloud setting }); - my $listTemplate = WebGUI::Asset->new($session, $self->keywordListTemplateId, 'WebGUI::Asset::Template'); + my $listTemplate = WebGUI::Asset->newById($session, $self->keywordListTemplateId); foreach my $keyword (@{ $keywords }) { ##Keywords may not be URL safe, so urlize them my $keyword_url = $self->getKeywordFilename($keyword); @@ -427,7 +427,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -558,7 +558,7 @@ sub viewTemplateVariables { ##Only build objects for the assets that we need STORY: foreach my $storyId (@{ $storyIds }) { - my $story = WebGUI::Asset->new($session, $storyId->{assetId}, $storyId->{className}, $storyId->{revisionDate}); + my $story = WebGUI::Asset->newById($session, $storyId->{assetId}, $storyId->{revisionDate}); next STORY unless $story; my $creationDate = $story->creationDate; my ($creationDay,undef) = $session->datetime->dayStartEnd($creationDate); diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm index bc5e10628..3f7b432e0 100644 --- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm +++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm @@ -98,7 +98,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, @@ -164,7 +164,7 @@ sub viewTemplateVariables { ##Only build objects for the assets that we need STORY: foreach my $storyId (@{ $storyIds }) { - my $story = WebGUI::Asset->new($session, $storyId->{assetId}, $storyId->{className}, $storyId->{revisionDate}); + my $story = WebGUI::Asset->newById($session, $storyId->{assetId}, $storyId->{revisionDate}); next STORY unless $story; my $storyVars = { url => ( $exporting @@ -186,7 +186,7 @@ sub viewTemplateVariables { my $topStoryData = $storyIds->[0]; shift @{ $var->{story_loop} }; ##Note, this could have saved from the loop above, but this looks more clean and encapsulated to me. - my $topStory = WebGUI::Asset->new($session, $topStoryData->{assetId}, $topStoryData->{className}, $topStoryData->{revisionDate}); + my $topStory = WebGUI::Asset->newById($session, $topStoryData->{assetId}, $topStoryData->{revisionDate}); $var->{topStoryTitle} = $topStory->getTitle; $var->{topStorySubtitle} = $topStory->subtitle; $var->{topStoryUrl} = $session->url->append($self->getUrl, 'func=viewStory;assetId='.$topStoryData->{assetId}), @@ -246,7 +246,7 @@ sub www_viewStory { my $storyId = $session->form->get('assetId'); my $story; if ($storyId) { - $story = WebGUI::Asset->new($session, $storyId); + $story = WebGUI::Asset->newById($session, $storyId); } if (! $story) { my $notFound = WebGUI::Asset->getNotFound($session); diff --git a/lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm b/lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm index 17abd5ed5..76c26e1c8 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm @@ -506,7 +506,7 @@ sub run { # Instantiate the asset to check it is a Survey instance, and to grab its assetId if ( $session->id->valid($asset_spec) ) { - $asset = WebGUI::Asset->new( $session, $asset_spec ); + $asset = WebGUI::Asset->newById( $session, $asset_spec ); } if ( !$asset ) { $asset = WebGUI::Asset->newByUrl( $session, $asset_spec ); diff --git a/lib/WebGUI/Asset/Wobject/Survey/Test.pm b/lib/WebGUI/Asset/Wobject/Survey/Test.pm index 1a0ccc32d..45bb8f101 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/Test.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/Test.pm @@ -127,7 +127,7 @@ sub run { } my $assetId = $self->get('assetId'); - my $survey = WebGUI::Asset::Wobject::Survey->new($session, $assetId); + my $survey = WebGUI::Asset::Wobject::Survey->newById($session, $assetId); if (!$survey || !$survey->isa('WebGUI::Asset::Wobject::Survey') ) { return { tap => "Bail Out! Unable to instantiate Survey using assetId: $assetId" }; } diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index 0953e4d0d..93dc9fed1 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -281,7 +281,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->next::method; - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index 8d7f10c1b..777581ba7 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -1229,7 +1229,7 @@ sub importAssetCollateralData { my $id = $data->{properties}{assetId}; my $class = $data->{properties}{className}; my $version = $data->{properties}{revisionDate}; - my $assetExists = WebGUI::Asset->new($self->session, $id, $class, $version); + my $assetExists = WebGUI::Asset->newById($self->session, $id, $version); $error->info("Importing Things for Thingy ".$data->{properties}{title}); my @importThings; @@ -1298,7 +1298,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/TimeTracking.pm b/lib/WebGUI/Asset/Wobject/TimeTracking.pm index 5328f147d..e53528e98 100644 --- a/lib/WebGUI/Asset/Wobject/TimeTracking.pm +++ b/lib/WebGUI/Asset/Wobject/TimeTracking.pm @@ -78,7 +78,7 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $template; - $template = WebGUI::Asset::Template->new($self->session, $self->userViewTemplateId); + $template = WebGUI::Asset::Template->newById($self->session, $self->userViewTemplateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/UserList.pm b/lib/WebGUI/Asset/Wobject/UserList.pm index d24820683..289265bf6 100644 --- a/lib/WebGUI/Asset/Wobject/UserList.pm +++ b/lib/WebGUI/Asset/Wobject/UserList.pm @@ -327,7 +327,7 @@ sub prepareView { if ($self->session->form->process("overrideTemplateId") ne "") { $templateId = $self->session->form->process("overrideTemplateId"); } - my $template = WebGUI::Asset::Template->new($self->session, $templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm index 7c20209f6..14e57bc09 100644 --- a/lib/WebGUI/Asset/Wobject/WeatherData.pm +++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm @@ -83,7 +83,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new($self->session, $self->templateId); + my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); if (!$template) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm index 92b8c7a49..ae997757f 100644 --- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm +++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm @@ -263,14 +263,14 @@ sub appendRecentChanges { my $self = shift; my $var = shift; my $limit = shift || $self->recentChangesCount || 50; - my $revisions = $self->session->db->read("select asset.assetId, assetData.revisionDate, asset.className + my $revisions = $self->session->db->read("select asset.assetId, assetData.revisionDate from asset left join assetData using (assetId) where asset.parentId=? and asset.className like ? and status='approved' order by assetData.revisionDate desc limit ?", [$self->getId, "WebGUI::Asset::WikiPage%", $limit]); - while (my ($id, $version, $class) = $revisions->array) { - my $asset = WebGUI::Asset->new($self->session, $id, $class, $version); + while (my ($id, $version) = $revisions->array) { + my $asset = WebGUI::Asset->newById($self->session, $id, $version); unless (defined $asset) { - $self->session->errorHandler->error("Asset $id $class $version could not be instanciated."); + $self->session->errorHandler->error("Asset $id $version could not be instanciated."); next; } my $user = WebGUI::User->new($self->session, $asset->actionTakenBy); @@ -533,7 +533,7 @@ sub prepareView { my $self = shift; $self->next::method; $self->{_frontPageTemplate} = - WebGUI::Asset::Template->new($self->session, $self->frontPageTemplateId); + WebGUI::Asset::Template->newById($self->session, $self->frontPageTemplateId); if (!$self->{_frontPageTemplate}) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, diff --git a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton index 223cf9a07..8baab7274 100644 --- a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton +++ b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton @@ -120,7 +120,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->get("templateId") ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->get("templateId") ); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton.minimal b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton.minimal index ecd1a1e9f..801a5e273 100644 --- a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton.minimal +++ b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton.minimal @@ -65,7 +65,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->get("templateIdView") ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->get("templateIdView") ); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/_NewAsset.skeleton b/lib/WebGUI/Asset/_NewAsset.skeleton index 118871d0e..492a311b4 100644 --- a/lib/WebGUI/Asset/_NewAsset.skeleton +++ b/lib/WebGUI/Asset/_NewAsset.skeleton @@ -160,7 +160,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->get("templateId") ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->get("templateId") ); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; } diff --git a/lib/WebGUI/Asset/_NewAsset.skeleton.minimal b/lib/WebGUI/Asset/_NewAsset.skeleton.minimal index 44ed6eaa7..cfc0d00b1 100644 --- a/lib/WebGUI/Asset/_NewAsset.skeleton.minimal +++ b/lib/WebGUI/Asset/_NewAsset.skeleton.minimal @@ -85,7 +85,7 @@ See WebGUI::Asset::prepareView() for details. sub prepareView { my $self = shift; $self->SUPER::prepareView(); - my $template = WebGUI::Asset::Template->new( $self->session, $self->get("templateIdView") ); + my $template = WebGUI::Asset::Template->newById( $self->session, $self->get("templateIdView") ); $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; }