oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mismatches between upgrades and WebGUI.conf.original

Browse source
This commit is contained in:
Graham Knop 2009-04-30 18:17:19 +00:00
parent 4ec14bc026
commit 1c7d8c5050
2 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
docs/upgrades/upgrade_7.7.4-7.7.5.pl
View file

@ -22,7 +22,6 @@ use Getopt::Long;
use WebGUI::Session;
use WebGUI::Storage;
use WebGUI::Asset;
use WebGUI::Utility qw/isIn/;
my $toVersion = '7.7.5';
@ -39,6 +38,8 @@ sm_upgradeConfigFiles($session);
sm_updateDailyWorkflow($session);
turnOffAdmin($session);
fixConfigs($session);
correctEventTemplateVariables($session);
addGlobalHeadTags( $session );
addShipsSeparateToSku($session);
@ -68,6 +69,29 @@ sub addGlobalHeadTags {
print "OK\n" unless $quiet;
}
#----------------------------------------------------------------------------
sub fixConfigs {
my $session = shift;
print "\tFixing misconfigurations... " unless $quiet;
my $config = $session->config;
$config->delete('workflow');
$config->addToArray( 'workflowActivities/None', 'WebGUI::Workflow::Activity::ExpirePurchasedThingyRecords');
$config->set('taxDrivers', [
"WebGUI::Shop::TaxDriver::Generic",
"WebGUI::Shop::TaxDriver::EU"
]);
$config->set('macros/SpectreCheck', 'SpectreCheck');
$config->set('assets/WebGUI::Asset::Sku::ThingyRecord', {
category => 'shop',
});
$config->set('assets/WebGUI::Asset::Wobject::Carousel', {
category => 'utilities',
});
print "Done.\n" unless $quiet;
}
sub installStoryManagerTables {
my ($session) = @_;
print "\tAdding Story Manager tables... " unless $quiet;
@ -136,12 +160,7 @@ sub sm_upgradeConfigFiles {
"category" => "community"
},
);
my $activities = $config->get('workflowActivities');
my $none = $activities->{None};
if (!isIn('WebGUI::Workflow::Activity::ArchiveOldStories', @{ $none })) {
unshift @{ $none }, 'WebGUI::Workflow::Activity::ArchiveOldStories';
}
$config->set('workflowActivities', $activities);
$config->addToArray('workflowActivities/None', 'WebGUI::Workflow::Activity::ArchiveOldStories');
print "DONE!\n" unless $quiet;
}

17
etc/WebGUI.conf.original
View file

@ -513,6 +513,9 @@
"WebGUI::Asset::Sku::Donation" : {
"category" : "shop"
},
'WebGUI::Asset::Sku::ThingyRecord' : {
"category" : "shop"
},
"WebGUI::Asset::Wobject::UserList" : {
"category" : "intranet"
},
@ -533,6 +536,9 @@
"WebGUI::Asset::Wobject::StoryTopic" : {
"category" : "community"
},
"WebGUI::Asset::Wobject::Carousel" : {
"category" : "utilities"
},
"WebGUI::Asset::Wobject::StockData" : {
"category" : "intranet"
},
@ -843,7 +849,8 @@
"WebGUI::Workflow::Activity::TrashClipboard",
"WebGUI::Workflow::Activity::TrashExpiredEvents",
"WebGUI::Workflow::Activity::SummarizePassiveAnalytics",
"WebGUI::Workflow::Activity::BucketPassiveAnalytics"
"WebGUI::Workflow::Activity::BucketPassiveAnalytics",
"WebGUI::Workflow::Activity::ExpirePurchasedThingyRecords"
],
"WebGUI::Asset::Wobject::Thingy" : [
"WebGUI::Workflow::Activity::NotifyAboutThing"
@ -974,7 +981,13 @@
"rar",
"gz",
"bz2"
]
],
# Drivers for the pluggable tax system
"taxDrivers" : [
"WebGUI::Shop::TaxDriver::Generic",
"WebGUI::Shop::TaxDriver::EU"
],
}