Merge branch 'master' of git@github.com:plainblack/webgui

This commit is contained in:
khenn 2010-08-10 20:15:08 -05:00
commit adf3fe68b0
3 changed files with 28 additions and 0 deletions

View file

@ -73,6 +73,7 @@ alterStoryArchiveTable($session);
##7.9.10-.11
alterStoryTopicTable($session);
addAssetReport($session);
finish($session); # this line required
@ -436,6 +437,30 @@ sub alterStoryTopicTable {
print "DONE!\n" unless $quiet;
}
#----------------------------------------------------------------------------
# Describe what our function does
sub addAssetReport {
my $session = shift;
print "\tAdding Asset Report Asset ... " unless $quiet;
#Add the database table
$session->db->write(q{
CREATE TABLE `AssetReport` (
`assetId` char(22) character set utf8 collate utf8_bin NOT NULL,
`revisionDate` bigint(20) NOT NULL,
`settings` mediumtext,
`templateId` char(22) character set utf8 collate utf8_bin default NULL,
`paginateAfter` bigint(20) default NULL,
PRIMARY KEY (`assetId`,`revisionDate`)
)
});
#Add the asset to the config file
$session->config->addToHash( "assets", "WebGUI::Asset::Wobject::AssetReport", { category => "utilities" } );
print "DONE!\n" unless $quiet;
}
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------

View file

@ -602,6 +602,9 @@
"WebGUI::Asset::Wobject::Article" : {
"category" : "basic"
},
"WebGUI::Asset::Wobject::AssetReport" : {
"category" : "utilities"
},
"WebGUI::Asset::Wobject::Search" : {
"category" : "basic"
},