From ffa90c5fbd248f5745849321d635d4a95af1be0a Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Thu, 24 Jan 2008 20:31:23 +0000 Subject: [PATCH] fix: 7.5.0 time tracker templates were corrupt, now fixed. fix: AssetPackage www_importPackage would give an error message about package being corrupt, but the package would import correctly. No longer gives error message. --- docs/changelog/7.x.x.txt | 4 ++++ docs/gotcha.txt | 7 +++++++ .../default-tt-template-user.wgpkg | Bin 3937 -> 0 bytes .../root_import_timetracking_user.wgpkg | Bin 0 -> 15872 bytes lib/WebGUI/AssetPackage.pm | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) delete mode 100644 docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg create mode 100644 docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 447010e2f..7a5bbe75b 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,10 @@ 7.5.1 - fix: Friends language error (perlDreamer Consulting, LLC.) http://www.plainblack.com/bugs/tracker/friends-language-error + - fix: newByDynamicClass would die if given bad parameters, must return undef + - fix: AssetPackage.pm would give an error on importing a package through + the web interface, but the package would be imported successfully. + - fix: 7.5.0 upgrade template for time tracker was corrupt. 7.5.0 - rfe: Search Asset returns URLs diff --git a/docs/gotcha.txt b/docs/gotcha.txt index bb7df50b8..3d5905ff6 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,13 @@ 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.5.1 +-------------------------------------------------------------------- + * There was a corrupt template in a package for the 7.5.0 upgrade. + If you already upgraded to 7.5.0, please import the package + located at: + WebGUI/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg + 7.5.0 -------------------------------------------------------------------- * Event related links are now displayed using a template loop diff --git a/docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg b/docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg deleted file mode 100644 index 4b0e90ff09a5409ca3594d98ec9f877b6d184eaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3937 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 diff --git a/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg b/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..e03a969a440acde705c51928cbb7f5ffc0b3ab88 GIT binary patch literal 15872 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 Ke3!r-O5p$8m^ASK literal 0 HcmV?d00001 diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm index aa954df7a..4cb6b13c0 100644 --- a/lib/WebGUI/AssetPackage.pm +++ b/lib/WebGUI/AssetPackage.pm @@ -313,7 +313,7 @@ sub www_importPackage { if ($storage->getFileExtension($storage->getFiles->[0]) eq "wgpkg") { $error = $self->importPackage($storage); } - if ($error) { + if (!blessed $error) { my $i18n = WebGUI::International->new($self->session, "Asset"); return $self->session->style->userStyle($i18n->get("package corrupt")); }