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

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}] ) ) {