Merge commit 'v7.10.20' into WebGUI8

docs/changelog/7.x.x.txt

@@ -1,3 +1,19 @@
+7.10.20
+ - fixed: Do not call group methods on an undefined value.
+ - fixed #12178: random deletion of columns may happen when a schema is saved (Amir Plivatsky)
+ - fixed #12179: DataTable Field types get reset to "Text" in Edit Schema (Amir Plivatsky)
+ - added: FormField macro for rendering Form objects directly from templates
+ - fixed: Generic Tax driver does not like spaces around commas
+ - fixed: Date formatting with WebGUI::DateTime has extra spaces for single digit months and days.
+ - fixed #12165:  Default date in Thingy doesn't work
+ - fixed #12188: Thingy broken after upgrade to 7.9.32-stable
+ - fixed #12184: Apache error in modperl.error.log (William McKee, Knowmad Technologies)
+ - fixed #12186: keywords template variable not working properly in Article
+ - fixed #12190: List type form plugins that do not override getOptions show no value when getValueAsHtml is called
+ - fixed #12135: Geo::Coder::Googlev3 needs common sense
+ - fixed #12183: Posts do not disqualify themselves when purged
+ - fixed #12189: installClass ignores preload.custom
+
 7.10.19
  - fixed #12169: extras uploads symlink export
  - Added ability to pass caller assetId to RenderThingMacro

docs/credits.txt

@@ -55,6 +55,7 @@ Contributing Developers..............C.J. Adams-Collier / <cjac@colliertech.org>
                                      Ernesto Hernández-Novich / itverx C.A.
                                      Stephen Opal / Plain Black
                                      Tavis Parker / Plain Black
+                                     Amir Plivatsky
                                      Daniel Quinlan
                                      Jukka Raimovaara / Mentalhouse Oy
                                      Alan Ritari / DonorWare

docs/upgrades/upgrade_7.10.18-7.10.19.pl

@@ -49,7 +49,7 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
-#----------------------------------------------------------------------------
+
 # Fix calendar feed urls that had adminId attached to them until they blew up
 sub fixBrokenCalendarFeedUrls {
     my $session = shift;

docs/upgrades/upgrade_7.10.19-7.10.20.pl

@@ -0,0 +1,147 @@
+#!/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.20';
+my $quiet; # this line required
+
+my $session = start(); # this line required
+
+addFormFieldMacroToConfig();
+
+# upgrade functions go here
+fixSpacesInTaxInfo ( $session );
+
+sub addFormFieldMacroToConfig {
+    print "\tAdd FormField macro to config... " unless $quiet;
+    $session->config->addToHash( 'macros', FormField => 'FormField' );
+    print "DONE!\n" unless $quiet;
+}    
+
+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;
+#}
+
+#----------------------------------------------------------------------------
+# Fix calendar feed urls that had adminId attached to them until they blew up
+sub fixSpacesInTaxInfo {
+    my $session = shift;
+    print "\tRemoving spaces around commas in generic tax rate information... " unless $quiet;
+    use WebGUI::Shop::TaxDriver::Generic;
+    my $taxer = WebGUI::Shop::TaxDriver::Generic->new($session);
+    my $taxIterator = $taxer->getItems;
+    while (my $taxInfo = $taxIterator->hashRef) {
+        my $taxId = $taxInfo->{taxId};
+        $taxer->add($taxInfo);  ##Automatically removes spaces now.
+        $taxer->delete({taxId => $taxId});
+    }
+    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