diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 107d88d04..fff8ff23b 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -25,6 +25,7 @@ - fix [ 1165598 ] Auth module numeric comparisons against Ids - Fixed a bunch of Collaboration System template problems. - fix [ 1165829 ] i18n/english/Eventscalendar.pm: double entrys [mwilson] + - fix [ 1165386 ] Templates page overlap [mwilson] 6.5.2 diff --git a/docs/upgrades/upgrade_6.5.2-6.5.3.pl b/docs/upgrades/upgrade_6.5.2-6.5.3.pl index faf4bc364..7c5a30d60 100644 --- a/docs/upgrades/upgrade_6.5.2-6.5.3.pl +++ b/docs/upgrades/upgrade_6.5.2-6.5.3.pl @@ -36,13 +36,12 @@ while (my $namespace = $sth->hashRef) { isHidden=>1, menuTitle=>$namespace->{namespace}, url=>$newUrl, - description=>$namespace, + description=>$namespace->{namespace}, templateId=>'PBtmpl0000000000000078', styleTemplateId=>'PBtmpl0000000000000060', printableStyleTemplateId=>'PBtmpl0000000000000111', groupIdView=>'4', - groupIdEdit=>'3', - description=>'' + groupIdEdit=>'3' }); 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; @@ -54,7 +53,7 @@ while (my $namespace = $sth->hashRef) { my $templateAssetId = $template->{assetId}; my $templateObject = WebGUI::Asset->new($templateAssetId); my $newUrl2 = $newUrl.$templateObject->getUrl; - my $result = WebGUI::SQL->write("update asset set lineage='$newLineage', parentId='$newParentId', url='$newUrl2' where assetId='$templateAssetId'"); + my $result = WebGUI::SQL->write("update asset set lineage='$newLineage', parentId='$newParentId' where assetId='$templateAssetId'"); } $sth2->finish; } @@ -65,6 +64,75 @@ $sth->finish; #container anyway...! WebGUI::SQL->write("update asset set groupIdView='4' where className='WebGUI::Asset::Template'"); +WebGUI::SQL->write("update wobject set styleTemplateId='PBtmpl0000000000000060' where assetId='$templateFolder'"); + +my $newFailSafe = ' + + + + ^Page("title"); - WebGUI + + + + + ^AdminBar; +
^PageTitle;
+
^AssetProxy(flexMenu);
+
+ ^LoginToggle;   ^a(^@;);   ^AdminToggle; +
+
+ + + +'; +WebGUI::SQL->write("update template set template=".quote($newFailSafe)." where assetId='PBtmpl0000000000000060'"); + + + WebGUI::Session::close();