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

Change newByDynamicClass to newById.

Browse source
This commit is contained in:
Colin Kuskie 2010-05-13 13:50:04 -07:00
parent 2a6e50b478
commit 7f23c286da
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/EMSSubmission.pm
View file

@ -346,8 +346,8 @@ sub www_editSubmission {
my $assetId = $self ? $self->getId : $params->{assetId} || $session->form->get('assetId') || 'new'; my $assetId = $self ? $self->getId : $params->{assetId} || $session->form->get('assetId') || 'new';
if( $assetId ne 'new' ) { if( $assetId ne 'new' ) {
$self ||= WebGUI::Asset->newByDynamicClass($session,$assetId); $self ||= eval { WebGUI::Asset->newById($session,$assetId); };
if (!defined $self) { if (Exception::Class->caught()) {
$session->errorHandler->error(__PACKAGE__ . " - failed to instanciate asset with assetId $assetId"); $session->errorHandler->error(__PACKAGE__ . " - failed to instanciate asset with assetId $assetId");
} }
} }

8
lib/WebGUI/Asset/File/GalleryFile.pm
View file

@ -435,7 +435,7 @@ sub getFirstFile {
my $allFileIds = $self->getParent->getFileIds; my $allFileIds = $self->getParent->getFileIds;
return undef unless @{ $allFileIds }; return undef unless @{ $allFileIds };
return WebGUI::Asset->newByDynamicClass( $self->session, shift @{ $allFileIds }); return WebGUI::Asset->newById( $self->session, shift @{ $allFileIds });
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -452,7 +452,7 @@ sub getLastFile {
my $allFileIds = $self->getParent->getFileIds; my $allFileIds = $self->getParent->getFileIds;
return undef unless @{ $allFileIds }; return undef unless @{ $allFileIds };
return WebGUI::Asset->newByDynamicClass( $self->session, pop @{ $allFileIds }); return WebGUI::Asset->newById( $self->session, pop @{ $allFileIds });
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -469,7 +469,7 @@ sub getNextFile {
return $self->{_nextFile} if $self->{_nextFile}; return $self->{_nextFile} if $self->{_nextFile};
my $nextId = $self->getParent->getNextFileId( $self->getId ); my $nextId = $self->getParent->getNextFileId( $self->getId );
return undef unless $nextId; return undef unless $nextId;
$self->{_nextFile} = WebGUI::Asset->newByDynamicClass( $self->session, $nextId ); $self->{_nextFile} = WebGUI::Asset->newById( $self->session, $nextId );
return $self->{_nextFile}; return $self->{_nextFile};
} }
@ -487,7 +487,7 @@ sub getPreviousFile {
return $self->{_previousFile} if $self->{_previousFile}; return $self->{_previousFile} if $self->{_previousFile};
my $previousId = $self->getParent->getPreviousFileId( $self->getId ); my $previousId = $self->getParent->getPreviousFileId( $self->getId );
return undef unless $previousId; return undef unless $previousId;
$self->{_previousFile} = WebGUI::Asset->newByDynamicClass( $self->session, $previousId ); $self->{_previousFile} = WebGUI::Asset->newById( $self->session, $previousId );
return $self->{_previousFile}; return $self->{_previousFile};
} }

4
lib/WebGUI/Asset/WikiPage.pm
View file

@ -289,8 +289,8 @@ sub getTemplateVars {
}); });
PAGE: foreach my $assetId (@{ $paginator->getPageData }) { PAGE: foreach my $assetId (@{ $paginator->getPageData }) {
next PAGE if $assetId->{assetId} eq $self->getId; next PAGE if $assetId->{assetId} eq $self->getId;
my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId->{assetId}); my $asset = eval { WebGUI::Asset->newById($session, $assetId->{assetId}); };
next PAGE unless $asset; next PAGE if Exception::Class->caught();
push @keyword_pages, { push @keyword_pages, {
title => $asset->getTitle, title => $asset->getTitle,
url => $asset->getUrl, url => $asset->getUrl,

12
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -1247,10 +1247,10 @@ sub _moveFileAjaxRequest {
# Get Id of target photo and instantiate asset # Get Id of target photo and instantiate asset
my $targetId = $args->{target}; my $targetId = $args->{target};
my $target = WebGUI::Asset->newByDynamicClass( $session, $targetId ); my $target = eval { WebGUI::Asset->newById( $session, $targetId ); };
# Return if target photo could not be instantiated # Return if target photo could not be instantiated
unless ( $target ) { if ( Exception::Class->caught() ) {
$session->log->error("Couldn't move file '$targetId' because we couldn't instantiate it."); $session->log->error("Couldn't move file '$targetId' because we couldn't instantiate it.");
$result{ errMessage } = "ID of target file seems to be invalid."; $result{ errMessage } = "ID of target file seems to be invalid.";
return \%result; return \%result;
@ -1266,10 +1266,10 @@ sub _moveFileAjaxRequest {
# Instantiate file with ID in before/after argument # Instantiate file with ID in before/after argument
$destId = $args->{before} ? $args->{before} : $args->{after}; $destId = $args->{before} ? $args->{before} : $args->{after};
$dest = WebGUI::Asset->newByDynamicClass( $session, $destId ); $dest = WebGUI::Asset->newById( $session, $destId );
# Return if destination file could not be instantiated # Return if destination file could not be instantiated
unless ( $dest ) { if ( Expeption::Class->caught() ) {
$session->log->error("Couldn't move file '$targetId' before/after file '$destId' because we couldn't instantiate the latter."); $session->log->error("Couldn't move file '$targetId' before/after file '$destId' because we couldn't instantiate the latter.");
$result{ errMessage } = "ID in before/after argument seems to be invalid."; $result{ errMessage } = "ID in before/after argument seems to be invalid.";
return \%result; return \%result;
@ -1286,14 +1286,14 @@ sub _moveFileAjaxRequest {
# Get ID of next sibling # Get ID of next sibling
$destId = $self->getNextFileId( $destId ); $destId = $self->getNextFileId( $destId );
# Instantiate next sibling # Instantiate next sibling
$dest = WebGUI::Asset->newByDynamicClass( $session, $destId ); $dest = WebGUI::Asset->newById( $session, $destId );
} }
# Check for use of before argument when increasing the rank # Check for use of before argument when increasing the rank
if ( $args->{before} && $target->getRank() < $dest->getRank() ) { if ( $args->{before} && $target->getRank() < $dest->getRank() ) {
# Get ID of previous sibling # Get ID of previous sibling
$destId = $self->getPreviousFileId( $destId ); $destId = $self->getPreviousFileId( $destId );
# Instantiate previous sibling # Instantiate previous sibling
$dest = WebGUI::Asset->newByDynamicClass( $session, $destId ); $dest = WebGUI::Asset->newById( $session, $destId );
} }
# Update rank of target photo # Update rank of target photo