From 992f35710dd000e187c1ca849781cbc673ac3869 Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Wed, 8 Apr 2009 18:08:50 +0000 Subject: [PATCH] Added Carousel to upgrade script, some code cleanup and template changes --- .../packages-7.7.3/root_import_carousel.wgpkg | Bin 1479 -> 1846 bytes ...oot_import_carousel_carousel-default.wgpkg | Bin 1163 -> 0 bytes docs/upgrades/upgrade_7.7.2-7.7.3.pl | 17 +++++ lib/WebGUI/Asset/Wobject/Carousel.pm | 63 +----------------- 4 files changed, 18 insertions(+), 62 deletions(-) delete mode 100644 docs/upgrades/packages-7.7.3/root_import_carousel_carousel-default.wgpkg 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 a581248fdfa6ead14ffebdd3b805e546f3e7cc5c..2f3f5e3a3b4161591dcae593b5d21beefa397c6f 100644 GIT binary patch literal 1846 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 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 c9796b7d321e79bcf248a0fa7cb2584ab8db1b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1163 zcmV;61a$i!iwFP!000001MOB>Z`(K!_H%y)p{E2$WXZQ(H$XN`n*h1m9Nl8Q2pEyJ znMkCTr0jZ&{P!JFk|{eex(g)0K7@cRiF1E5oS|QP{S^d3x81JQf*|a+1NTJB71Y8o z>~xyVMzh4cdKD|ZyI#|?%!UwSr4N6kLIQQ)%J3|Xmt;6)+Uobx z>@H?%N{N%@bpDNTBIZ_U;0S8LMXK0Sbz;t`yjD~mlXXYv4=wQ##pDW4o(f{6s4j#K zuoRi1@l}$>w(8Aa=&WZlw#uaty3P_4TRkddmM^=6j&T-iC&ttfBZTtxV3@j)LJPe} zb08{lPQa1$m>d$OtyI`>>NExSO7Mn+%}@kbs}Cb@k+EI%!1%7h$;jIq$q^svp$7I_ zHb#mn#RT_fSo)YGjGyy@1(?#koDYa75?o6WtG!`8EtS*@E&2DVV!{+Sw76nArcUFu zvGhwD3OM9U*d5S6ZTu?(R7H}d8oYP z2;l4dFREs*K-sXFH574a!Qy4~pjC|{Z5d;>M90ua9$K?tc8^JEAeXX|RM!EI{ z|9F1-6;9Y@KDQ6z;5hSaM>{5^N%YUWZglDH))^Z==U`fyeFl z>sw_{@FnGh%B}79s9r}9AA)8{7HBLaycrVX6QrjU<>7DCqo!hRv>>CWIBpx{D((#H zMG}o(^DAnBjq@V4J0|h2w=g~hr}VXqKS_~XVDK_;K$YGUGfs=y;Mp$u%x%GGw7uyJ zCwYteM(;jf9}fomrt1y{S7j?(9Sa9j%qN>>%Bdi1%wSrWc@s98{UB&HJ8fst_7+S1 zn0I1SR+Zx^`s)p&`H1N{5>uw@VknQ?f}=odP0xe|>yfPtORoTvP@dT)_zUA^^ksGu zc{qi!I;)O8+gUEz--Y!?zYdb->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