diff --git a/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg b/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg index a581248fd..2f3f5e3a3 100644 Binary files a/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg and b/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg differ diff --git a/docs/upgrades/packages-7.7.3/root_import_carousel_carousel-default.wgpkg b/docs/upgrades/packages-7.7.3/root_import_carousel_carousel-default.wgpkg deleted file mode 100644 index c9796b7d3..000000000 Binary files a/docs/upgrades/packages-7.7.3/root_import_carousel_carousel-default.wgpkg and /dev/null differ diff --git a/docs/upgrades/upgrade_7.7.2-7.7.3.pl b/docs/upgrades/upgrade_7.7.2-7.7.3.pl index 790fcda61..e51a8b263 100644 --- a/docs/upgrades/upgrade_7.7.2-7.7.3.pl +++ b/docs/upgrades/upgrade_7.7.2-7.7.3.pl @@ -34,6 +34,7 @@ my $session = start(); # this line required addSurveyQuizModeColumns($session); addSurveyExpressionEngineConfigFlag($session); +addCarouselWobject($session); finish($session); # this line required @@ -47,6 +48,22 @@ finish($session); # this line required # print "DONE!\n" unless $quiet; #} +sub addCarouselWobject{ + my $session = shift; + print "\tAdding Carousel wobject... " unless $quiet; + $session->db->write("create table Carousel ( + assetId char(22) binary not null, + revisionDate bigint not null, + items mediumtext, + templateId char(22), + primary key (assetId, revisionDate) + )"); + my $assets = $session->config->get( "assets" ); + $assets->{ "WebGUI::Asset::Wobject::Carousel" } = { category => "utilities" }; + $session->config->set( "assets", $assets ); + print "Done.\n" unless $quiet; +} + sub addSurveyQuizModeColumns{ my $session = shift; print "\tAdding columns to Survey table... " unless $quiet; diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm index d9d5f7c33..955f01aec 100644 --- a/lib/WebGUI/Asset/Wobject/Carousel.pm +++ b/lib/WebGUI/Asset/Wobject/Carousel.pm @@ -40,7 +40,7 @@ sub definition { %properties = ( templateId =>{ fieldType =>"template", - defaultValue =>'CarouselTmpl0000000002', + defaultValue =>'CarouselTmpl0000000001', tab =>"display", noFormPost =>0, namespace =>"Carousel", @@ -273,66 +273,5 @@ adminConsole views. # return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get("edit title")); #} - - -#------------------------------------------------------------------- -# Everything below here is to make it easier to install your custom -# wobject, but has nothing to do with wobjects in general -#------------------------------------------------------------------- -# cd /data/WebGUI/lib -# perl -MWebGUI::Asset::Wobject::Carousel -e install www.example.com.conf [ /path/to/WebGUI ] -# - or - -# perl -MWebGUI::Asset::Wobject::Carousel -e uninstall www.example.com.conf [ /path/to/WebGUI ] -#------------------------------------------------------------------- - - -use base 'Exporter'; -our @EXPORT = qw(install uninstall); -use WebGUI::Session; - -#------------------------------------------------------------------- -sub install { - my $config = $ARGV[0]; - my $home = $ARGV[1] || "/data/WebGUI"; - die "usage: perl -MWebGUI::Asset::Wobject::Carousel -e install www.example.com.conf\n" unless ($home && $config); - print "Installing asset.\n"; - my $session = WebGUI::Session->open($home, $config); - - my $assets = $session->config->get( "assets" ); - $assets->{ "WebGUI::Asset::Wobject::Carousel" } = { category => "utilities" }; - $session->config->set( "assets", $assets ); - #$session->config->addToArray("assets","WebGUI::Asset::Wobject::Carousel"); - $session->db->write("create table Carousel ( - assetId char(22) binary not null, - revisionDate bigint not null, - items mediumtext, - templateId char(22), - primary key (assetId, revisionDate) - )"); - $session->var->end; - $session->close; - print "Done. Please restart Apache.\n"; -} - -#------------------------------------------------------------------- -sub uninstall { - my $config = $ARGV[0]; - my $home = $ARGV[1] || "/data/WebGUI"; - die "usage: perl -MWebGUI::Asset::Wobject::Carousel -e uninstall www.example.com.conf\n" unless ($home && $config); - print "Uninstalling asset.\n"; - my $session = WebGUI::Session->open($home, $config); - $session->config->deleteFromArray("assets","WebGUI::Asset::Wobject::Carousel"); - my $rs = $session->db->read("select assetId from asset where className='WebGUI::Asset::Wobject::Carousel'"); - while (my ($id) = $rs->array) { - my $asset = WebGUI::Asset->new($session, $id, "WebGUI::Asset::Wobject::Carousel"); - $asset->purge if defined $asset; - } - $session->db->write("drop table Carousel"); - $session->var->end; - $session->close; - print "Done. Please restart Apache.\n"; -} - - 1; #vim:ft=perl