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

Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8

Browse source 
Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
This commit is contained in:
Doug Bell 2011-05-13 18:20:52 -05:00
commit 677ac978b6
89 changed files with 1064 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sbin/diskUsage.pl
View file

@ -66,7 +66,7 @@ sub du {
my $totalSize; # disk space used
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;
print "\nStarting with asset $assetId...\n" unless $quiet;
}

6
sbin/findBrokenAssets.pl
View file

@ -109,9 +109,9 @@ while ( my %row = $sth->hash ) {
}
print "Fixed.\n";
my $asset = WebGUI::Asset->newByDynamicClass( $session, $row{assetId} );
my $asset = WebGUI::Asset->newById( $session, $row{assetId} );
# Make sure we have a valid parent
unless ( $asset && WebGUI::Asset->newByDynamicClass( $session, $row{parentId} ) ) {
unless ( WebGUI::Asset->newById( $session, $row{parentId} ) ) {
$asset->setParent( WebGUI::Asset->getImportNode( $session ) );
print "\tNOTE: Invalid parent. Asset moved to Import Node\n";
}
@ -145,7 +145,7 @@ while ( my %row = $sth->hash ) {
printf "%10s: %s\n", "class", $row{className};
# 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;
}
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 {
my $fromAsset = undef;
if (defined $fromAssetId) {
$fromAsset = WebGUI::Asset->newByDynamicClass($session, $fromAssetId);
$fromAsset = WebGUI::Asset->newById($session, $fromAssetId);
}
else {
$fromAsset = WebGUI::Asset->newByUrl($session, $fromAssetUrl);
@ -241,7 +241,7 @@ sub addAlbumFromFolder {
} );
for my $fileId ( @{ $fileIds } ) {
my $oldFile = WebGUI::Asset->newByDynamicClass( $session, $fileId );
my $oldFile = WebGUI::Asset->newById( $session, $fileId );
my $oldStorage = $oldFile->getStorageLocation;
my $className = $gallery->getAssetClassForFile( $oldStorage->getPath( $oldFile->get('filename') ) );
if ( !$className ) {

2
sbin/generateContent.pl
View file

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

1
sbin/testEnvironment.pl
View file

@ -178,6 +178,7 @@ checkModule('Devel::StackTrace', '1.27' );
checkModule('Devel::StackTrace::WithLexicals', '0.03' );
checkModule('Data::ICal', '0.16' );
checkModule('Geo::Coder::Googlev3', '0.07' );
checkModule('IO::File::WithPath', );
failAndExit("Required modules are missing, running no more checks.") if $missingModule;