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

Conflicts:

	docs/upgrades/upgrade_7.8.0-7.8.1.pl
This commit is contained in:
daviddelikat 2009-10-01 06:01:48 -05:00
commit 5f3477be4a
17 changed files with 347 additions and 194 deletions

View file

@ -23,6 +23,15 @@
- fixed #11062: subscriptionCode
- fixed #11061: SQLForm_fieldOrder
- fixed #11066: wrong definitions
- fixed #11070: i18n Asset_Navigation::assetsToInclude
- fixed #11068: ITransact_recurringStatus
- fixed #11075: product destroys variants
- fixed #11073: preview interchanges width and height properties
- fixed #11079: Datepicker, without times, does not highlight my birthday
- fixed #11071: Form::Date / Session::DateTime
- fixed #11076: WebGUI::Account::Friends message_rpp
- fixed #11067: My Purchases Detail Template - Status Message broken
- fixed #11081: Prop style in 7.8.0?
7.8.0
- upgraded YUI to 2.8.0r4

View file

@ -33,9 +33,14 @@ my $session = start(); # this line required
fixWikis( $session );
fixEMSTemplates( $session );
removeOldSubscriptionTables( $session );
removeOldITransactTables( $session );
removeSQLFormTables( $session );
fixBadRevisionDateColumns( $session );
<<<<<<< HEAD:docs/upgrades/upgrade_7.8.0-7.8.1.pl
addEMSSubmission( $session );
=======
removeImportCruft( $session );
>>>>>>> ad702e908f63d36d79be04054b586044bd3c9ecf:docs/upgrades/upgrade_7.8.0-7.8.1.pl
finish($session); # this line required
@ -83,6 +88,14 @@ sub removeOldSubscriptionTables {
print "Done.\n" unless $quiet;
}
# Describe what our function does
sub removeOldITransactTables {
my $session = shift;
print "\tRemoving tables leftover from the old 7.5 ITransact Plugin... " unless $quiet;
$session->db->write('DROP TABLE IF EXISTS ITransact_recurringStatus');
print "Done.\n" unless $quiet;
}
# Describe what our function does
sub fixWikis {
my $session = shift;
@ -101,7 +114,6 @@ sub fixEMSTemplates {
print "Done.\n" unless $quiet;
}
#----------------------------------------------------------------------------
# Add tables for the EMS Submission feature
sub addEMSSubmission {
my $session = shift;
@ -154,6 +166,17 @@ ESQL
print "DONE!\n" unless $quiet;
}
# Describe what our function does
sub removeImportCruft {
my $session = shift;
print "\tRemoving cruft from the import node... " unless $quiet;
my $propFolder = WebGUI::Asset->newByDynamicClass($session, '2c4RcwsUfQMup_WNujoTGg');
if ($propFolder) {
$propFolder->purge;
}
print "Done.\n" unless $quiet;
}
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------