more bug fixes
This commit is contained in:
parent
f232b6facb
commit
40065e93e8
10 changed files with 33 additions and 18 deletions
|
|
@ -22,6 +22,8 @@
|
|||
- fix [ 1165373 ] sort templates into folders by namespace under ImportNode
|
||||
- fix [ 1118789 ] 6.2.11 - L_loginBox display with empty 1st param [colink]
|
||||
- fix [ 1165635 ] IndexedSearch - double toolbar in AdminMode [mwilson]
|
||||
- fix [ 1165598 ] Auth module numeric comparisons against Ids
|
||||
- Fixed a bunch of Collaboration System template problems.
|
||||
|
||||
|
||||
6.5.2
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ WebGUI::Session::open("../..",$configFile);
|
|||
#--------------------------------------------
|
||||
print "\tSorting templates under the Import Node into folders by namespace.\n" unless ($quiet);
|
||||
my ($templateFolder) = WebGUI::SQL->quickArray("select assetId from asset where parentId='PBasset000000000000002' and className='WebGUI::Asset::Wobject::Folder' and title='Templates' limit 1");
|
||||
my $namespacesQuery = "select distinct template.namespace from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace";
|
||||
$templateFolder ||= 'PBasset000000000000002';
|
||||
my $namespacesQuery = "select distinct template.namespace from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace";
|
||||
my $parent = WebGUI::Asset->new($templateFolder);
|
||||
my $sth = WebGUI::SQL->read($namespacesQuery);
|
||||
my $folder;
|
||||
|
|
@ -43,7 +44,7 @@ while (my $namespace = $sth->hashRef) {
|
|||
groupIdEdit=>'3',
|
||||
description=>''
|
||||
});
|
||||
my $templatesquery = "select * from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc";
|
||||
my $templatesquery = "select * from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc";
|
||||
my $newParentId = $folder->getId;
|
||||
my $sth2 = WebGUI::SQL->read($templatesquery);
|
||||
my $first = 1;
|
||||
|
|
@ -81,4 +82,4 @@ sub getNextLineage {
|
|||
my $rank = substr($startLineage,$depth,6);
|
||||
my $parentLineage = substr($startLineage,0,$depth);
|
||||
return $parentLineage.sprintf("%06d",($rank+1));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue