From 9a8b6d292ebe9805c6ebc02cadc303148de18037 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 28 Sep 2009 13:38:18 -0700 Subject: [PATCH] Fix EMS Schdedule template bugs. Fixes bug #10988. Give the EMS Schdule template its own namespace. In the db, remove usage of EMS template and EMS Schedule templates in the wrong places. --- docs/changelog/7.x.x.txt | 1 + docs/gotcha.txt | 9 +++++++++ ...mport_ems_ems-schedule-listing-default2.wgpkg | Bin 0 -> 4615 bytes docs/upgrades/upgrade_7.8.0-7.8.1.pl | 10 ++++++++++ .../Asset/Wobject/EventManagementSystem.pm | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 78bde1a91..640064f12 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -15,6 +15,7 @@ - fixed #11037: Maintenance page is being cached - fixed #11056: No history in wiki - added RFE #10940: Force the user to pick a shipping method before checking out. + - fixed #10988: EMS Schedule -- Data Error 7.8.0 - upgraded YUI to 2.8.0r4 diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 90487d3fd..2c57edda0 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,15 @@ upgrading from one version to the next, or even between multiple versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +7.8.1 +-------------------------------------------------------------------- + + * The EventManagementSystem schedule template as accidently given + the same namespace as the main EMS template. This allowed the + wrong template to be chosen for the main EMS template and the + schedule template. The upgrade from 7.8.0 to 7.8.1 will attempt + to fix this when default templates have been used. + 7.8.0 -------------------------------------------------------------------- diff --git a/docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg b/docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..7296a45020156d0ad3300a311132248e19b2b0d8 GIT binary patch literal 4615 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 literal 0 HcmV?d00001 diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl index c18bcd7d0..3e6921553 100644 --- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl +++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl @@ -31,6 +31,7 @@ my $quiet; # this line required my $session = start(); # this line required fixWikis( $session ); +fixEMSTemplates( $session ); finish($session); # this line required @@ -53,6 +54,15 @@ sub fixWikis { print "Done.\n" unless $quiet; } +# Describe what our function does +sub fixEMSTemplates { + my $session = shift; + print "\tFixing bad usage of Event Management System templates... " unless $quiet; + $session->db->write(q|update EventManagementSystem set templateId='2rC4ErZ3c77OJzJm7O5s3w' where templateId='S2_LsvVa95OSqc66ITAoig'|); + $session->db->write(q|update EventManagementSystem set scheduleTemplateId='S2_LsvVa95OSqc66ITAoig' where scheduleTemplateId='2rC4ErZ3c77OJzJm7O5s3w'|); + print "Done.\n" unless $quiet; +} + # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 8f1d9f56a..ae04b1d45 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -66,7 +66,7 @@ sub definition { tab => 'display', label => $i18n->get('schedule template'), hoverHelp => $i18n->get('schedule template help'), - namespace => 'EMS', + namespace => 'EMS/Schedule', }, scheduleColumnsPerPage => { fieldType => 'Integer',