-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'v7.10.23' into WebGUI8. Tests need fixing.
- Loading branch information
Showing
72 changed files
with
578 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+1.64 KB
docs/upgrades/packages-7.10.23/shopping-cart-collateral-items_my-purchases-default.wgpkg
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
#!/usr/bin/env perl | ||
|
||
#------------------------------------------------------------------- | ||
# WebGUI is Copyright 2001-2009 Plain Black Corporation. | ||
#------------------------------------------------------------------- | ||
# Please read the legal notices (docs/legal.txt) and the license | ||
# (docs/license.txt) that came with this distribution before using | ||
# this software. | ||
#------------------------------------------------------------------- | ||
# http://www.plainblack.com info@plainblack.com | ||
#------------------------------------------------------------------- | ||
|
||
our ($webguiRoot); | ||
|
||
BEGIN { | ||
$webguiRoot = "../.."; | ||
unshift (@INC, $webguiRoot."/lib"); | ||
} | ||
|
||
use strict; | ||
use Getopt::Long; | ||
use WebGUI::Session; | ||
use WebGUI::Storage; | ||
use WebGUI::Asset; | ||
|
||
|
||
my $toVersion = '7.10.23'; | ||
my $quiet; # this line required | ||
|
||
|
||
my $session = start(); # this line required | ||
|
||
# upgrade functions go here | ||
fixBadTemplateAttachments($session); | ||
|
||
finish($session); # this line required | ||
|
||
|
||
#---------------------------------------------------------------------------- | ||
# Describe what our function does | ||
#sub exampleFunction { | ||
# my $session = shift; | ||
# print "\tWe're doing some stuff here that you should know about... " unless $quiet; | ||
# # and here's our code | ||
# print "DONE!\n" unless $quiet; | ||
#} | ||
|
||
#---------------------------------------------------------------------------- | ||
sub fixBadTemplateAttachments { | ||
my $session = shift; | ||
print "\tRemove template attachements in search templates that refer to an old, deleted CSS snippet... " unless $quiet; | ||
# and here's our code | ||
use WebGUI::Asset::Template; | ||
my $get_template = WebGUI::Asset::Template->getIsa($session); | ||
TEMPLATE: while (1) { | ||
my $template = eval {$get_template->()}; | ||
next TEMPLATE if Exception::Class->caught; | ||
last TEMPLATE unless $template; | ||
next TEMPLATE unless $template->get('namespace') eq 'Search'; | ||
$template->removeAttachments(['^/(webgui.css);']); | ||
} | ||
print "DONE!\n" unless $quiet; | ||
} | ||
|
||
|
||
# -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- | ||
|
||
#---------------------------------------------------------------------------- | ||
# Add a package to the import node | ||
sub addPackage { | ||
my $session = shift; | ||
my $file = shift; | ||
|
||
print "\tUpgrading package $file\n" unless $quiet; | ||
# Make a storage location for the package | ||
my $storage = WebGUI::Storage->createTemp( $session ); | ||
$storage->addFileFromFilesystem( $file ); | ||
|
||
# Import the package into the import node | ||
my $package = eval { | ||
my $node = WebGUI::Asset->getImportNode($session); | ||
$node->importPackage( $storage, { | ||
overwriteLatest => 1, | ||
clearPackageFlag => 1, | ||
setDefaultTemplate => 1, | ||
} ); | ||
}; | ||
|
||
if ($package eq 'corrupt') { | ||
die "Corrupt package found in $file. Stopping upgrade.\n"; | ||
} | ||
if ($@ || !defined $package) { | ||
die "Error during package import on $file: $@\nStopping upgrade\n."; | ||
} | ||
|
||
return; | ||
} | ||
|
||
#------------------------------------------------- | ||
sub start { | ||
my $configFile; | ||
$|=1; #disable output buffering | ||
GetOptions( | ||
'configFile=s'=>\$configFile, | ||
'quiet'=>\$quiet | ||
); | ||
my $session = WebGUI::Session->open($webguiRoot,$configFile); | ||
$session->user({userId=>3}); | ||
my $versionTag = WebGUI::VersionTag->getWorking($session); | ||
$versionTag->set({name=>"Upgrade to ".$toVersion}); | ||
return $session; | ||
} | ||
|
||
#------------------------------------------------- | ||
sub finish { | ||
my $session = shift; | ||
updateTemplates($session); | ||
my $versionTag = WebGUI::VersionTag->getWorking($session); | ||
$versionTag->commit; | ||
$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")"); | ||
$session->close(); | ||
} | ||
|
||
#------------------------------------------------- | ||
sub updateTemplates { | ||
my $session = shift; | ||
return undef unless (-d "packages-".$toVersion); | ||
print "\tUpdating packages.\n" unless ($quiet); | ||
opendir(DIR,"packages-".$toVersion); | ||
my @files = readdir(DIR); | ||
closedir(DIR); | ||
my $newFolder = undef; | ||
foreach my $file (@files) { | ||
next unless ($file =~ /\.wgpkg$/); | ||
# Fix the filename to include a path | ||
$file = "packages-" . $toVersion . "/" . $file; | ||
addPackage( $session, $file ); | ||
} | ||
} | ||
|
||
#vim:ft=perl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.