merging back with HEAD

docs/changelog/7.x.x.txt

@@ -1,10 +1,28 @@
+7.6.14
+ - fixed: IE6 shows Admin Bar over Asset Manager
+ - fixed #9808: Search i18n 
+ - fixed #9818: deleteAttachedFiles bug (THE REVENGE)
+ - fixed #9809: Pagination list up to 10/20: not working correctly on last pages.
+ - fixed #9820: Survey: political party spelled wrong
+ - fixed #9819: Survey: hoverhelp showing instead of field name
+ - fixed #9822: Matrix: Wrong field label
+ - fixed #9823: Matrix: no cancel button in add/edit listing
+
 7.6.13
+ - fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
  - fixed #9760: DataForm not working in demo.plainblack.com
  - fixed #9759: Delete Entry Button missing in Data Form
  - fixed #9767: FileAsset breaks 'null' rule for FileAsset table
  - fixed defaultValues of undef cause mysql5.1 to complain about columns that are set to be NOT NULL.  5.0 doesn't care.
  - International text retrieval has been optimized
  - fixed #9766: Thingy Pagination Broken
+ - fixed #9779: Gallery: js for search (datepicker?) included in album view
+ - fixed #9783: payment methods are not added
+ - fixed #9785: Delete All button not working in Account/Inbox [TEMPLATE]
+ - fixed #9803: Survey 2.0- Gradebook spelled wrong
+ - fixed #9801: Survey 2.0- Template spelled wrong
+ - fixed #9802: Survey Template field names to be consistent
+ - fixed: HTMLForm generated forms have an extra double quote in the table tag.
 
 7.6.12
  - fixed: During postback on a recurring transaction, the routine could error out instead of catching an error.

docs/upgrades/upgrade_7.5.40-7.6.10.pl

@@ -295,7 +295,8 @@ sub upgradeMatrix {
     $db->write("alter table Matrix_rating rename MatrixListing_rating");
     $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary");
     $db->write("alter table Matrix_field rename Matrix_attribute");
-    $db->write("alter table Matrix_attribute drop column label");
+    $db->write("alter table Matrix_attribute drop column name");
+    $db->write("alter table Matrix_attribute change label name char(255)");
     $db->write("alter table Matrix_attribute add column options text");
     $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'");
     $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");

docs/upgrades/upgrade_7.6.13-7.6.14.pl

@@ -0,0 +1,125 @@
+#!/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.6.14';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+
+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;
+#}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    # 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 = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+
+    # Make the package not a package anymore
+    $package->update({ isPackage => 0 });
+    
+    # Set the default flag for templates added
+    my $assetIds
+        = $package->getLineage( ['self','descendants'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Template' ],
+        } );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        $asset->update( { isDefault => 1 } );
+    }
+
+    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',".$session->datetime->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

docs/upgrades/upgrade_7.6.3-7.6.4.pl

@@ -102,7 +102,8 @@ sub upgradeMatrix {
     $db->write("alter table Matrix_rating rename MatrixListing_rating");
     $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary");
     $db->write("alter table Matrix_field rename Matrix_attribute");
-    $db->write("alter table Matrix_attribute drop column label");
+    $db->write("alter table Matrix_attribute drop column name");
+    $db->write("alter table Matrix_attribute change label name char(255)");
     $db->write("alter table Matrix_attribute add column options text");
     $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'");
     $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");