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

Change newByDynamicClass calls that creept in back to newById, except for the ones in doc/upgrade. Kinda important.

Browse source
This commit is contained in:
Scott Walters 2011-05-11 16:26:32 -04:00
parent 57d2dbed56
commit 96bb194402
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Auth/WebGUI.pm
View file

@ -1127,7 +1127,7 @@ sub www_emailRecoverPasswordFinish {
my $mail = WebGUI::Mail::Send->create($session, { to=>$email, subject=>$i18n->get('WebGUI password recovery')}); my $mail = WebGUI::Mail::Send->create($session, { to=>$email, subject=>$i18n->get('WebGUI password recovery')});
my $vars = { }; my $vars = { };
$vars->{recoverPasswordUrl} = $session->url->append($session->url->getSiteURL,'op=auth;method=emailResetPassword;token='.$recoveryGuid); $vars->{recoverPasswordUrl} = $session->url->append($session->url->getSiteURL,'op=auth;method=emailResetPassword;token='.$recoveryGuid);
my $template = WebGUI::Asset->newByDynamicClass($session, $session->setting->get('webguiPasswordRecoveryEmailTemplate')); my $template = WebGUI::Asset->newById($session, $session->setting->get('webguiPasswordRecoveryEmailTemplate'));
my $emailText = $template->process($vars); my $emailText = $template->process($vars);
WebGUI::Macro::process($session, \$emailText); WebGUI::Macro::process($session, \$emailText);
$mail->addText($emailText); $mail->addText($emailText);

2
lib/WebGUI/Workflow/Activity/NotifyAboutVersionTag.pm
View file

@ -108,7 +108,7 @@ sub execute {
comments => $versionTag->get('comments'), comments => $versionTag->get('comments'),
url => $urlOfSingleAsset, url => $urlOfSingleAsset,
}; };
my $template = WebGUI::Asset->newByDynamicClass($self->session, $self->get('templateId')); my $template = WebGUI::Asset->newById($self->session, $self->get('templateId'));
my $message = $template->process($var); my $message = $template->process($var);
my $properties = { my $properties = {
status=>"completed", status=>"completed",

2
lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm
View file

@ -295,7 +295,7 @@ sub sendMessage {
comments => $versionTag->get('comments'), comments => $versionTag->get('comments'),
url => $approvalUrl, url => $approvalUrl,
}; };
my $template = WebGUI::Asset->newByDynamicClass($self->session, $self->get('templateId')); my $template = WebGUI::Asset->newById($self->session, $self->get('templateId'));
my $messageText = $template->process($var); my $messageText = $template->process($var);
for my $groupId ( @{ $self->getGroupToApprove } ) { for my $groupId ( @{ $self->getGroupToApprove } ) {
my $message my $message

2
sbin/diskUsage.pl
View file

@ -66,7 +66,7 @@ sub du {
my $totalSize; # disk space used my $totalSize; # disk space used
if ($assetId) { # They specified an assetId to start with if ($assetId) { # They specified an assetId to start with
$asset = WebGUI::Asset->newByDynamicClass($session,$assetId); $asset = WebGUI::Asset->newById($session,$assetId);
die ("Unable to instanciate asset $assetId") unless defined $asset; die ("Unable to instanciate asset $assetId") unless defined $asset;
print "\nStarting with asset $assetId...\n" unless $quiet; print "\nStarting with asset $assetId...\n" unless $quiet;
} }

6
sbin/findBrokenAssets.pl
View file

@ -104,8 +104,8 @@ while ( my %row = $sth->hash ) {
print "Fixed.\n"; print "Fixed.\n";
# Make sure we have a valid parent # Make sure we have a valid parent
unless ( WebGUI::Asset->newByDynamicClass( $session, $row{parentId} ) ) { unless ( WebGUI::Asset->newById( $session, $row{parentId} ) ) {
my $asset = WebGUI::Asset->newByDynamicClass( $session, $row{assetId} ); my $asset = WebGUI::Asset->newById( $session, $row{assetId} );
$asset->setParent( WebGUI::Asset->getImportNode( $session ) ); $asset->setParent( WebGUI::Asset->getImportNode( $session ) );
print "\tNOTE: Invalid parent. Asset moved to Import Node\n"; print "\tNOTE: Invalid parent. Asset moved to Import Node\n";
} }
@ -136,7 +136,7 @@ while ( my %row = $sth->hash ) {
printf "%10s: %s\n", "class", $row{className}; printf "%10s: %s\n", "class", $row{className};
# Parent # Parent
if ( my $parent = WebGUI::Asset->newByDynamicClass( $session, $row{parentId} ) ) { if ( my $parent = WebGUI::Asset->newById( $session, $row{parentId} ) ) {
printf "%10s: %s (%s)\n", "parent", $parent->getTitle, $parent->getId; printf "%10s: %s (%s)\n", "parent", $parent->getTitle, $parent->getId;
} }
elsif ( $session->db->quickScalar( "SELECT * FROM asset WHERE assetId=?", [$row{parentId}] ) ) { elsif ( $session->db->quickScalar( "SELECT * FROM asset WHERE assetId=?", [$row{parentId}] ) ) {

4
sbin/galleryImport.pl
View file

@ -64,7 +64,7 @@ if ( $gallery && $gallery->isa('WebGUI::Asset::Wobject::Gallery') ) {
else { else {
my $fromAsset = undef; my $fromAsset = undef;
if (defined $fromAssetId) { if (defined $fromAssetId) {
$fromAsset = WebGUI::Asset->newByDynamicClass($session, $fromAssetId); $fromAsset = WebGUI::Asset->newById($session, $fromAssetId);
} }
else { else {
$fromAsset = WebGUI::Asset->newByUrl($session, $fromAssetUrl); $fromAsset = WebGUI::Asset->newByUrl($session, $fromAssetUrl);
@ -241,7 +241,7 @@ sub addAlbumFromFolder {
} ); } );
for my $fileId ( @{ $fileIds } ) { for my $fileId ( @{ $fileIds } ) {
my $oldFile = WebGUI::Asset->newByDynamicClass( $session, $fileId ); my $oldFile = WebGUI::Asset->newById( $session, $fileId );
my $oldStorage = $oldFile->getStorageLocation; my $oldStorage = $oldFile->getStorageLocation;
my $className = $gallery->getAssetClassForFile( $oldStorage->getPath( $oldFile->get('filename') ) ); my $className = $gallery->getAssetClassForFile( $oldStorage->getPath( $oldFile->get('filename') ) );
if ( !$className ) { if ( !$className ) {

2
sbin/generateContent.pl
View file

@ -47,7 +47,7 @@ if ($url) {
$asset = WebGUI::Asset->newByUrl($session,$url); $asset = WebGUI::Asset->newByUrl($session,$url);
} }
else { else {
$asset = WebGUI::Asset->newByDynamicClass($session,$assetId); $asset = WebGUI::Asset->newById($session,$assetId);
} }
if (defined $asset) { if (defined $asset) {

2
t/Asset/File/GalleryFile/Photo/edit.t
View file

@ -148,7 +148,7 @@ $mech->submit_form_ok({
}, },
'Submit Photo edit form' ); 'Submit Photo edit form' );
# Re-create instance of Photo asset # Re-create instance of Photo asset
$photo = WebGUI::Asset->newByDynamicClass($session, $photo->getId); $photo = WebGUI::Asset->newById($session, $photo->getId);
# Check whether properties were changed correctly # Check whether properties were changed correctly
cmp_deeply($photo->get, superhashof(\%properties), 'All changes applied'); cmp_deeply($photo->get, superhashof(\%properties), 'All changes applied');