diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7056f4e9a..4097780c7 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.5.14 + - fixed: ems 2.0: tickets get created as badges also - fixed: Non-admin users can now add Gallery assets - fixed: Thingy Data now retains File and Images if they aren't explicitly deleted - fixed: Rich Editor no longer makes other form controls show up as code in Safari 3 diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl index dc409ad19..2a6206938 100644 --- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl +++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl @@ -84,7 +84,7 @@ fixAdminConsoleTemplateTitles( $session ); makeLongerAssetMetadataValues( $session ); removeOldCommerceCode($session); convertDataForm( $session ); -ensureCorrectDefaults( $session ); +#ensureCorrectDefaults( $session ); finish($session); # this line required @@ -650,7 +650,7 @@ sub upgradeEMS { my $end = WebGUI::DateTime->new($session, $ticketData->{endDate}); my $duration = $end - $start; my $ticket = $ems->addChild({ - className => 'WebGUI::Asset::Sku::EMSBadge', + className => 'WebGUI::Asset::Sku::EMSTicket', title => $ticketData->{title}, url => $ticketData->{title}, description => $ticketData->{description},