diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 4909c304c..1c73d2086 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -2,6 +2,9 @@ - Changed to new POD format. - Fixed GUID related bugs in search indexer and passive profiling. - Fixed a bug in page tree where indenting wasn't working. + - bugfix [ 1028746 ] All pages shown as Roots & PageTree not working + - bugfix [ 1028561 ] Manage Users - Next Page Link Broken + - bugfix [ 1028494 ] Folder not shown in Manage Collateral 6.2.2 diff --git a/docs/upgrades/upgrade_6.2.2-6.2.3.sql b/docs/upgrades/upgrade_6.2.2-6.2.3.sql index ab262b135..460431811 100644 --- a/docs/upgrades/upgrade_6.2.2-6.2.3.sql +++ b/docs/upgrades/upgrade_6.2.2-6.2.3.sql @@ -1,2 +1,3 @@ insert into webguiVersion values ('6.2.3','upgrade',unix_timestamp()); +update collateralFolder set parentId='-1' where parentId='0'; diff --git a/lib/WebGUI/CollateralFolder.pm b/lib/WebGUI/CollateralFolder.pm index 07b083bef..7659e06a6 100644 --- a/lib/WebGUI/CollateralFolder.pm +++ b/lib/WebGUI/CollateralFolder.pm @@ -50,7 +50,7 @@ sub classSettings { return { properties => { name => { quote => 1 }, - parentId => { defaultValue => 0 }, + parentId => { quote => 1 }, collateralFolderId => { key => 1 }, description => { quote => 1 } }, diff --git a/lib/WebGUI/Operation/Collateral.pm b/lib/WebGUI/Operation/Collateral.pm index 740832a88..c9dc10fe7 100644 --- a/lib/WebGUI/Operation/Collateral.pm +++ b/lib/WebGUI/Operation/Collateral.pm @@ -457,7 +457,7 @@ sub www_listCollateral { .' '.WebGUI::International::get(542).''; } $sth = WebGUI::SQL->read("select collateralFolderId, name, description from collateralFolder - where parentId=".quote($folderId)." and collateralFolderId<>0 order by name"); + where parentId=".quote($folderId)." order by name"); while ($data = $sth->hashRef) { $output .= 'new(WebGUI::URL::page($op)); + my $p = WebGUI::Paginator->new(WebGUI::URL::page("op=".$op)); $p->setDataByQuery($sql); return $p; } else {