From b8127bafec31b50a860392cabf41e93130791b72 Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Tue, 8 Sep 2009 11:02:15 -0500
Subject: [PATCH 01/11] Revert "When opening or duplicating Session objects,
 pass on any Apache2::Request object"

This reverts commit ed97fa1ecd06d0ccf3b5a36c5a5072c0de2db8fd.
---
 lib/WebGUI/Asset/Wobject/StoryArchive.pm | 2 +-
 lib/WebGUI/AssetAspect/RssFeed.pm        | 2 +-
 lib/WebGUI/AssetExportHtml.pm            | 2 --
 lib/WebGUI/Session.pm                    | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
index e234a6f28..16d2cf162 100644
--- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm
+++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
@@ -221,7 +221,7 @@ sub exportAssetCollateral {
     my $printSession = WebGUI::Session->open(
         $self->session->config->getWebguiRoot,
         $self->session->config->getFilename,
-        $self->session->request,
+        undef,
         undef,
         $self->session->getId,
     );
diff --git a/lib/WebGUI/AssetAspect/RssFeed.pm b/lib/WebGUI/AssetAspect/RssFeed.pm
index f7b322007..b1caab66f 100644
--- a/lib/WebGUI/AssetAspect/RssFeed.pm
+++ b/lib/WebGUI/AssetAspect/RssFeed.pm
@@ -232,7 +232,7 @@ sub exportAssetCollateral {
         my $exportSession = WebGUI::Session->open(
             $self->session->config->getWebguiRoot,
             $self->session->config->getFilename,
-            $self->session->request,
+            undef,
             undef,
             $self->session->getId,
         );
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index d22e0eb82..cfa8f68c3 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -267,7 +267,6 @@ sub exportAsHtml {
     my $exportSession = WebGUI::Session->open(
         $session->config->getWebguiRoot,
         $session->config->getFilename,
-        $session->request,
     );
     my $esGuard = Scope::Guard->new(sub {
         $exportSession->var->end;
@@ -503,7 +502,6 @@ sub exportGetDescendants {
             $session = WebGUI::Session->open(
                 $session->config->getWebguiRoot,
                 $session->config->getFilename,
-                $session->request,
             );
             $session->user( { userId => $user->userId } );
             $sGuard = Scope::Guard->new(sub {
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index c53abc3df..1ffcd69a5 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -252,7 +252,7 @@ sub duplicate {
     my $newSession = WebGUI::Session->open(
         $self->config->getWebguiRoot,
         $self->config->getFilename,
-        $self->request,
+        undef,
         undef,
         $self->getId,
     );

From 1671aefee5a9a30c2d20aba3c852f1089dc2ed09 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 8 Sep 2009 17:05:00 -0700
Subject: [PATCH 02/11] Write a test that says that loading Form plugins from a
 place other than /data/WebGUI/lib/WebGUI works.

---
 t/Form/DynamicField.t         | 40 +++++++++++++++++++++++++++
 t/lib/WebGUI/Form/FormTest.pm | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 t/Form/DynamicField.t
 create mode 100644 t/lib/WebGUI/Form/FormTest.pm

diff --git a/t/Form/DynamicField.t b/t/Form/DynamicField.t
new file mode 100644
index 000000000..404648b18
--- /dev/null
+++ b/t/Form/DynamicField.t
@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Form;
+use WebGUI::Form::FieldType;
+use WebGUI::Session;
+
+#The goal of this test is to verify that Email form elements work.
+#The Email form accepts and validates an email address.
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+# put your tests here
+
+my $formClass = 'WebGUI::Form::DynamicField';
+
+my $numTests = 1;
+
+plan tests => $numTests;
+
+my $form = WebGUI::Form::DynamicField->new($session,
+    fieldType => 'FormTest',
+);
+
+diag "Test loading a Form from a location outside of /data/WebGUI/lib/WebGUI";
+isa_ok($form, 'WebGUI::Form::FormTest');
diff --git a/t/lib/WebGUI/Form/FormTest.pm b/t/lib/WebGUI/Form/FormTest.pm
new file mode 100644
index 000000000..c042a3e7e
--- /dev/null
+++ b/t/lib/WebGUI/Form/FormTest.pm
@@ -0,0 +1,52 @@
+package WebGUI::Form::FormTest;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+  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
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use base 'WebGUI::Form::Control';
+use WebGUI::International;
+
+=head1 NAME
+
+Package WebGUI::Form::FormTest
+
+=head1 DESCRIPTION
+
+Dummy Form plugin for testing dynamic loading of Forms from other locations.
+
+=head1 SEE ALSO
+
+This is a subclass of WebGUI::Form::Control.
+
+=head1 METHODS 
+
+The following methods are specifically available from this class. Check the superclass for additional methods.
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 getName ( session )
+
+Returns the human readable name of this control.
+
+=cut
+
+sub getName {
+    my ($self, $session) = @_;
+    return 'FormTest';
+}
+
+1;

From 5cb3a6e005cfc1423bff5b7d1687728a4635ac9f Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 8 Sep 2009 18:04:41 -0700
Subject: [PATCH 03/11] Add default values to the Matrix to newly added
 columns. bug #10889

---
 docs/upgrades/upgrade_7.7.19-7.8.0.pl | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/upgrades/upgrade_7.7.19-7.8.0.pl b/docs/upgrades/upgrade_7.7.19-7.8.0.pl
index 37d6204b4..f16cdd794 100644
--- a/docs/upgrades/upgrade_7.7.19-7.8.0.pl
+++ b/docs/upgrades/upgrade_7.7.19-7.8.0.pl
@@ -33,6 +33,7 @@ my $session = start(); # this line required
 # upgrade functions go here
 reorganizeAdSpaceProperties($session);
 fixTemplateSettingsFromShunt($session);
+addMatrixColumnDefaults($session);
 
 finish($session); # this line required
 
@@ -58,6 +59,18 @@ sub reorganizeAdSpaceProperties {
     print "DONE!\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub addMatrixColumnDefaults {
+    my $session = shift;
+    print "\tUpdate existing Matrixes with default values for maxComparisons... " unless $quiet;
+    $session->db->write(q|UPDATE Matrix set maxComparisons=25           where maxComparisons           IS NULL|);
+    $session->db->write(q|UPDATE Matrix set maxComparisonsGroup=25      where maxComparisonsGroup      IS NULL|);
+    $session->db->write(q|UPDATE Matrix set maxComparisonsPrivileged=25 where maxComparisonsPrivileged IS NULL|);
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
 sub fixTemplateSettingsFromShunt {
     my $session = shift;
     print "\tClear isPackage and set isDefault on recently imported templates... " unless $quiet;

From 2cf67ecba498e7fdce2470815a515ec77d13a726 Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Tue, 8 Sep 2009 20:05:47 -0500
Subject: [PATCH 04/11] fixed #10889: Old Matrixs break for Admin users

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Asset/Wobject/Matrix.pm | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ecf1432e6..e9d1cc3a4 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -25,6 +25,7 @@
  - fixed #10925: Wrong message in i18n
  - relabel Help in the Admin Console to Template Help
  - fixed #10928: EMS Print Ticket -- Time not processed for timezone
+ - fixed #10889: Old Matrixs break for Admin users
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 13ed6b3cc..fa65ae3a8 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -472,7 +472,8 @@ sub getCompareForm {
     }
     else{
         $maxComparisons = $self->get('maxComparisonsPrivileged');
-    }        
+    }
+    $maxComparisons += 0;
     $form .=  "\n<script type='text/javascript'>\n".
         'var maxComparisons = '.$maxComparisons.";\n".
         "var matrixUrl = '".$self->getUrl."';\n".
@@ -664,6 +665,7 @@ sub view {
     else{
         $maxComparisons = $self->get('maxComparisonsPrivileged');
     }
+    $maxComparisons += 0;
     $var->{maxComparisons} = $maxComparisons;
    
     if ($self->canEdit){
@@ -912,6 +914,7 @@ sub www_compare {
     else{
         $maxComparisons = $self->get('maxComparisonsPrivileged');
     }
+    $maxComparisons += 0;
 
     foreach my $listingId (@listingIds){
         my $listingId_safe = $listingId;

From 2948e68781fadc79cfa9bd0b1d9359b38535a35d Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 8 Sep 2009 21:17:41 -0700
Subject: [PATCH 05/11] Fix 10939, commit with approval breaks on assets with
 autocommit children, Post, Story, Wiki, Event, etc.

Encapsulate a new method to get a fresh asset from the db.  With tests.
---
 docs/changelog/7.x.x.txt     |  1 +
 lib/WebGUI/Asset.pm          | 48 ++++++++++++++++++++++++++----------
 lib/WebGUI/Asset/Template.pm |  4 +--
 t/Asset/Asset.t              | 16 +++++++++++-
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e9d1cc3a4..d0b3166dd 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -26,6 +26,7 @@
  - relabel Help in the Admin Console to Template Help
  - fixed #10928: EMS Print Ticket -- Time not processed for timezone
  - fixed #10889: Old Matrixs break for Admin users
+ - fixed #10939: Commit with Approval workflow does not show confirmation screen
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index de15930f6..6c92f4657 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -346,6 +346,26 @@ sub checkView {
 
 #-------------------------------------------------------------------
 
+=head2 cloneFromDb ( )
+
+Fetches a new fresh clone of this object from the database.  Often used after
+calling commit on version tags.
+
+Returns the new Asset object.
+
+=cut
+
+sub cloneFromDb {
+	my $self = shift;
+    return WebGUI::Asset->new($self->session,
+        $self->getId,
+        $self->get('className'),
+        $self->get('revisionDate')
+    );
+}
+
+#-------------------------------------------------------------------
+
 =head2 definition ( session, [ definition ] )
 
 Basic definition of an Asset. Properties, default values. Returns an array reference containing tableName,className,properties
@@ -2784,11 +2804,12 @@ sub www_editSave {
     $object->updateHistory("edited");
 
     # we handle auto commit assets here in case they didn't handle it themselves
+    $session->log->warn('pre object isa'. ref $object);
     if ($object->getAutoCommitWorkflowId) {
+        $session->log->warn('got autocommit workflow id');
         $object->requestAutoCommit;
         #Since the version tag makes new objects, fetch a fresh one here.
-        #Note, this workaround can still fail, if WebGUI hands off back to spectre.
-        $object = WebGUI::Asset->new($session, $object->getId, $object->get('className'));
+        $object = $object->cloneFromDb;
     }
     # else, try to to auto commit
     else {
@@ -2804,9 +2825,10 @@ sub www_editSave {
         elsif ($commitStatus eq 'commit') {
             ##Commit was successful.  Update the local object cache so that it will no longer
             ##register as locked.
-            $self->{_properties}{isLockedBy} = $object->{_properties}{isLockedBy} = undef;
+            $object = $object->cloneFromDb;
         }
     }
+    $session->log->warn('post object isa'. ref $object);
 
     # Handle "saveAndReturn" button
     if ( $session->form->process( "saveAndReturn" ) ne "" ) {
@@ -2814,23 +2836,23 @@ sub www_editSave {
     }
 
     # Handle "proceed" form parameter
-    my $proceed = $self->session->form->process('proceed');
+    my $proceed = $session->form->process('proceed');
     if ($proceed eq "manageAssets") {
-        $self->session->asset($object->getParent);
-        return $self->session->asset->www_manageAssets;
+        $session->asset($object->getParent);
+        return $session->asset->www_manageAssets;
     }
     elsif ($proceed eq "viewParent") {
-        $self->session->asset($object->getParent);
-        return $self->session->asset->www_view;
+        $session->asset($object->getParent);
+        return $session->asset->www_view;
     }
-    elsif ($proceed eq "goBackToPage" && $self->session->form->process('returnUrl')) {
-        $self->session->http->setRedirect($self->session->form->process("returnUrl"));
+    elsif ($proceed eq "goBackToPage" && $session->form->process('returnUrl')) {
+        $session->http->setRedirect($session->form->process("returnUrl"));
         return undef;
     }
     elsif ($proceed ne "") {
-        my $method = "www_".$self->session->form->process("proceed");
-        $self->session->asset($object);
-        return $self->session->asset->$method();
+        my $method = "www_".$session->form->process("proceed");
+        $session->asset($object);
+        return $session->asset->$method();
     }
 
     $session->asset($object->getContainer);
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 67bf4aa21..798ebf0bc 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -889,9 +889,9 @@ sub www_editDuplicate {
                         # Auto-commit our revision if necessary
                         # TODO: This needs to be handled automatically somehow...
                         my $status = WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
-                        ##Force the locked by tag
+                        ##get a fresh object from the database
                         if ($status eq 'commit') {
-                            $newTemplate->{_properties}{isLockedBy} = undef;
+                            $newTemplate = $newTemplate->cloneFromDb;
                         }
                         last DEF;
                     }
diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
index 873c3b8af..1695608cd 100644
--- a/t/Asset/Asset.t
+++ b/t/Asset/Asset.t
@@ -153,7 +153,7 @@ $canViewMaker->prepare(
     },
 );
 
-plan tests => 113 
+plan tests => 115 
             + scalar(@fixIdTests)
             + scalar(@fixTitleTests)
             + 2*scalar(@getTitleTests) #same tests used for getTitle and getMenuTitle
@@ -874,6 +874,20 @@ is($testVersionTag->get('isCommitted'),1,'parent asset is now committed');
 $childVersionTag = WebGUI::VersionTag->new($session, $childAsset->get('tagId'));
 is($childVersionTag->get('isCommitted'),1,'child asset is now committed');
 
+################################################################
+#
+# cloneFromDb
+#
+################################################################
+
+my $assetToCommit = $defaultAsset->addChild({ className => 'WebGUI::Asset::Snippet', title => 'Snippet to commit and clone from db', });
+my $cloneTag = WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->tagsToRollback($cloneTag);
+$cloneTag->commit;
+is($assetToCommit->get('status'), 'pending', 'cloneFromDb: local asset is still pending');
+$assetToCommit = $assetToCommit->cloneFromDb;
+is($assetToCommit->get('status'), 'approved', '... returns fresh, commited asset from the db');
+
 ##Return an array of hashrefs.  Each hashref describes a test
 ##for the fixId method.
 

From f6be0746f318348a8565cb06c3fc63ca71abd35f Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Tue, 8 Sep 2009 22:56:01 -0500
Subject: [PATCH 06/11] use consistant messages for WEBGUI_LIVE tests

---
 t/Asset/Event/edit.t                      |  5 ++---
 t/Workflow/Activity/CalendarUpdateFeeds.t | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/t/Asset/Event/edit.t b/t/Asset/Event/edit.t
index de716e025..c2e73acbf 100644
--- a/t/Asset/Event/edit.t
+++ b/t/Asset/Event/edit.t
@@ -74,9 +74,8 @@ if ( !$mech->success ) {
     plan skip_all => "Cannot load URL '$baseUrl'. Will not test.";
 }
 
-if ( !$ENV{WEBGUI_LIVE}) {
-    plan skip_all => "Live tests not enabled";
-}
+plan skip_all => 'set WEBGUI_LIVE to enable this test'
+    unless $ENV{WEBGUI_LIVE};
 
 plan tests => 8;        # Increment this number for each test you create
 
diff --git a/t/Workflow/Activity/CalendarUpdateFeeds.t b/t/Workflow/Activity/CalendarUpdateFeeds.t
index 7a9591738..7c1392e97 100644
--- a/t/Workflow/Activity/CalendarUpdateFeeds.t
+++ b/t/Workflow/Activity/CalendarUpdateFeeds.t
@@ -22,12 +22,10 @@ use Test::More;
 use Test::Deep;
 use Data::Dumper;
 
-if (!$ENV{WEBGUI_LIVE}) {
-    plan skip_all => 'No website available';
-}
-else {
-    plan tests => 14; # increment this value for each test you create
-}
+plan skip_all => 'set WEBGUI_LIVE to enable this test'
+    unless $ENV{WEBGUI_LIVE};
+
+plan tests => 14; # increment this value for each test you create
 
 my $session = WebGUI::Test->session;
 

From 9f2db435ba1b4429f24250596f82f685642c3f0a Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Wed, 9 Sep 2009 01:15:59 -0500
Subject: [PATCH 07/11] prevent Workflow from trying to run an activity if it
 didn't get an object

---
 lib/WebGUI/Workflow/Instance.pm |  4 +--
 t/Workflow/Instance.t           | 44 ++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Workflow/Instance.pm b/lib/WebGUI/Workflow/Instance.pm
index 27956d104..a53b99db3 100644
--- a/lib/WebGUI/Workflow/Instance.pm
+++ b/lib/WebGUI/Workflow/Instance.pm
@@ -395,8 +395,8 @@ sub getObject {
         push @params, $self->session;
     }
     push @params, $self->get("parameters");
-    WebGUI::Pluggable::load($class);
-    return $self->{_object} = $class->$method(@params);
+    my $object = WebGUI::Pluggable::instanciate( $class, $method, \@params );
+    return $self->{_object} = $object;
 }
 
 #-------------------------------------------------------------------
diff --git a/t/Workflow/Instance.t b/t/Workflow/Instance.t
index e84d856ba..11876dd46 100644
--- a/t/Workflow/Instance.t
+++ b/t/Workflow/Instance.t
@@ -17,6 +17,8 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
+use Test::Exception;
+use Scope::Guard;
 
 use Test::MockObject;
 my $mockSpectre = Test::MockObject->new();
@@ -46,7 +48,7 @@ my $session         = WebGUI::Test->session;
 #----------------------------------------------------------------------------
 # Tests
 
-plan tests => 32;        # Increment this number for each test you create
+plan tests => 34;        # Increment this number for each test you create
 
 #----------------------------------------------------------------------------
 # put your tests here
@@ -181,6 +183,46 @@ my $wf2 = WebGUI::Workflow->create(
 my $wf2Instance = WebGUI::Workflow::Instance->create($session, {workflowId => $wf2->getId});
 cmp_deeply($wf2Instance->get('parameters'), {}, 'get returns {} for parameters when there are no parameters stored');
 
+###############################################################################
+#
+#  getObject
+#
+###############################################################################
+
+{
+    my $return;
+    Test::MockObject->fake_module('WebGUI::Test::Workflow::Instance::TestObject',
+        new => sub {
+            return $return;
+        },
+    );
+
+    my $wf3 = WebGUI::Workflow->create(
+        $session,
+        {
+            title => 'WebGUI::Workflow::Instance Test',
+            description => 'getObject test',
+            type => 'WebGUI::Test::Workflow::Instance::TestObject',
+        }
+    );
+    my $wf3guard = Scope::Guard->new(sub {
+        $wf3->delete;
+    });
+
+    my $wf3Instance = WebGUI::Workflow::Instance->create( $session, {
+        workflowId => $wf3->getId,
+        className  => 'WebGUI::Test::Workflow::Instance::TestObject',
+        methodName => 'new',
+    });
+
+    dies_ok { $wf3Instance->getObject } 'getObject throws when instanciation returns undef';
+
+    $return = Test::MockObject->new;
+    lives_and {
+        is $wf3Instance->getObject, $return;
+    } 'getObject is able to retrieve correct object';
+}
+
 #----------------------------------------------------------------------------
 # Cleanup
 END {

From 9ec062d5bc0aa34a3c5c141af7dcc5860051c0e8 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 9 Sep 2009 07:45:04 -0700
Subject: [PATCH 08/11] Usability improvement for the edit version tag screen.
 rfe #10862

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Operation/VersionTag.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index d0b3166dd..677d8cd6b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -27,6 +27,7 @@
  - fixed #10928: EMS Print Ticket -- Time not processed for timezone
  - fixed #10889: Old Matrixs break for Admin users
  - fixed #10939: Commit with Approval workflow does not show confirmation screen
+ - fixed #10862: Version tag contents page
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm
index 0496b451d..7402e4aad 100644
--- a/lib/WebGUI/Operation/VersionTag.pm
+++ b/lib/WebGUI/Operation/VersionTag.pm
@@ -792,12 +792,12 @@ sub www_manageRevisionsInTag {
         . '<tr>'
         . '<td colspan="5">'
         . $i18n->get("manageRevisionsInTag with selected")
-        . '<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag purge') . '" class="red" />'
         . '<input type="submit" name="action" value="'. $i18n->get("manageRevisionsInTag move")  . '" />'
         . WebGUI::Form::SelectBox( $session, {
             name        => 'moveToTagId',
             options     => \%moveToTagOptions,
         } )
+        . '&nbsp;<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag purge') . '" class="red" />'
         . '</td>'
         . '</tr>'
         . '<tr>'

From c189c6967b2d6cb62a4276cc3a70cd74ed9bbd37 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 9 Sep 2009 09:52:34 -0700
Subject: [PATCH 09/11] Read preload.custom for extra lib paths in tests.

---
 t/lib/WebGUI/Test.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm
index 9c757d92d..bdb10bcdf 100644
--- a/t/lib/WebGUI/Test.pm
+++ b/t/lib/WebGUI/Test.pm
@@ -126,6 +126,24 @@ BEGIN {
 
     push (@INC,$WEBGUI_LIB);
 
+    ##Handle custom loaded library paths
+    warn $WEBGUI_ROOT;
+    my $customPreload = File::Spec->catdir( $WEBGUI_ROOT, 'sbin', 'preload.custom');
+    warn $customPreload;
+    if (-e $customPreload) {
+        open my $PRELOAD, '<', $customPreload or
+            croak "Unload to open $customPreload: $!\n";
+        LINE: while (my $line = <$PRELOAD>) {
+            $line =~ s/#.*//;
+            $line =~ s/^\s+//;
+            $line =~ s/\s+$//;
+            next LINE if !$line;
+            warn $line;
+            push @INC, $line;
+        }
+        close $PRELOAD;
+    }
+
     # http://thread.gmane.org/gmane.comp.apache.apreq/3378
     # http://article.gmane.org/gmane.comp.apache.apreq/3388
     if ( $^O eq 'darwin' && $Config::Config{osvers} lt '8.0.0' ) {

From 237af9f52709109b6b96bd464863c750858f03aa Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 9 Sep 2009 09:55:22 -0700
Subject: [PATCH 10/11] Fix JS form issues with ThingyRecord. bug #10943

---
 docs/changelog/7.x.x.txt                      |  1 +
 lib/WebGUI/Asset/Sku/ThingyRecord.pm          |  2 +-
 .../build/thingyRecord/thingyRecord.js        | 27 ++++++++++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 677d8cd6b..69fc42c3e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -28,6 +28,7 @@
  - fixed #10889: Old Matrixs break for Admin users
  - fixed #10939: Commit with Approval workflow does not show confirmation screen
  - fixed #10862: Version tag contents page
+ - fixed #10943: ThingyRecord JS Broken
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
index 4faeee448..391759182 100644
--- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm
+++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
@@ -206,7 +206,7 @@ sub drawEditFieldPrice {
     my ( $self ) = @_;
 
     my $fieldHtml   = sprintf <<'ENDHTML', encode_entities( $self->get('fieldPrice') );
-<div id="fieldPrice"></div><input type="hidden" name="fieldPrice" value="%s" />
+<div id="fieldPrice"></div><input type="hidden" name="fieldPrice" value="%s" id="fieldPrice_formId"/>
 ENDHTML
 
     return $fieldHtml;
diff --git a/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js b/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js
index c1fa7f7ee..ee15a7127 100644
--- a/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js
+++ b/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js
@@ -15,7 +15,7 @@ WebGUI.ThingyRecord.getThingFields
     var callback = {
         success : function (o) {
             // Add fields to select list
-            var el      = document.forms[0].elements['thingFields'];
+            var el      = document.getElementById('thingFields_formId');
             while ( el.options.length >= 1 )
                 el.remove(0);
             var fields  = YAHOO.lang.JSON.parse( o.responseText );
@@ -38,16 +38,17 @@ WebGUI.ThingyRecord.getThingFields
 WebGUI.ThingyRecord.updateFieldPrices
 = function ( ) {
     var form        = document.forms[0];
-    var fieldList   = form.elements["thingFields"];
+    var fieldList   = document.getElementById( 'thingFields_formId' );
     var selected    = [];
     var div         = document.getElementById( 'fieldPrice' );
+    var fieldPrice  = document.getElementById( 'fieldPrice_formId' );
     var currentPrices = {};
     try {
-        currentPrices = YAHOO.lang.JSON.parse( form.elements["fieldPrice"].value );
+        currentPrices = YAHOO.lang.JSON.parse( fieldPrice.value );
     } 
     catch (e) {
         // Initialize if there's a parse error
-        form.elements["fieldPrice"].value = "{}";    
+        fieldPrice.value = "{}";    
     }
 
     // Get the selected fields
@@ -60,7 +61,7 @@ WebGUI.ThingyRecord.updateFieldPrices
             currentPrices[ opt.value ] = 0;
         }
     }
-    form.elements['fieldPrice'].value = YAHOO.lang.JSON.stringify( currentPrices );
+    fieldPrice.value = YAHOO.lang.JSON.stringify( currentPrices );
 
     // Clear out old records
     while ( div.childNodes.length ) 
@@ -78,9 +79,9 @@ WebGUI.ThingyRecord.updateFieldPrices
         price.value = currentPrices[ opt.value ] ? currentPrices[ opt.value ] : "0.00";
         YAHOO.util.Event.addListener( price, "change", function () {
             var fieldName = this.name.substr( "fieldPrice_".length );
-            var json = YAHOO.lang.JSON.parse( form.elements["fieldPrice"].value );
+            var json = YAHOO.lang.JSON.parse( fieldPrice.value );
             json[fieldName] = this.value;
-            form.elements["fieldPrice"].value = YAHOO.lang.JSON.stringify( json );
+            fieldPrice.value = YAHOO.lang.JSON.stringify( json );
         } );
 
         label.appendChild( price );
@@ -93,19 +94,21 @@ WebGUI.ThingyRecord.updateFieldPrices
 
 // Load the columns and field prices
 YAHOO.util.Event.onDOMReady( function () {
-    var form    = document.forms[0];
+    var form        = document.forms[0];
+    var thingId     = document.getElementById("thingId_formId");
+    var thingFields = document.getElementById("thingFields_formId")
 
     // Add events to form fields
-    YAHOO.util.Event.addListener( form.elements["thingId"], "change", function () {
+    YAHOO.util.Event.addListener( thingId, "change", function () {
         WebGUI.ThingyRecord.getThingFields( this.value );
     } );
     
-    YAHOO.util.Event.addListener( form.elements['thingFields'], "change", function () {
+    YAHOO.util.Event.addListener( thingFields, "change", function () {
         WebGUI.ThingyRecord.updateFieldPrices();
     } );
 
     // Populate the fields list if necessary
-    if ( form.elements[ "thingId" ].value ) {
-        WebGUI.ThingyRecord.getThingFields( form.elements[ "thingId"].value );
+    if ( thingId.value ) {
+        WebGUI.ThingyRecord.getThingFields( thingId.value );
     }
 } );

From e6f38dcf440a05dcef7ae3aa4a5c07adaf15da79 Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Wed, 9 Sep 2009 11:46:18 -0500
Subject: [PATCH 11/11] add new API for mocking assets in tests

---
 t/Workflow/Activity/GetCsMail.t | 15 +++---
 t/lib/WebGUI/Test.pm            | 94 +++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/t/Workflow/Activity/GetCsMail.t b/t/Workflow/Activity/GetCsMail.t
index 014ae95de..da874f98d 100644
--- a/t/Workflow/Activity/GetCsMail.t
+++ b/t/Workflow/Activity/GetCsMail.t
@@ -102,9 +102,7 @@ $post2mock->set_always('getId', $post2_id);
 
 {
     # simulate asset not found
-    local *WebGUI::Asset::newByDynamicClass = sub {
-        return undef;
-    };
+    WebGUI::Test->mockAssetId($post2_id, undef);
     $getmock->set_series('getNextMessage', {
         from => 'admin@localhost',
         parts => ['parts'],
@@ -114,12 +112,11 @@ $post2mock->set_always('getId', $post2_id);
     });
     $activity->execute($csmock);
     is $parentAsset->getId, $cs_id, 'add as new thread to current cs if reply to nonexistant post';
+    WebGUI::Test->unmockAssetId($post2_id);
 }
 
 {
-    local *WebGUI::Asset::newByDynamicClass = sub {
-        return $post2mock;
-    };
+    WebGUI::Test->mockAssetId($post2_id, $post2mock);
     $getmock->set_series('getNextMessage', {
         from => 'admin@localhost',
         parts => ['parts'],
@@ -129,12 +126,11 @@ $post2mock->set_always('getId', $post2_id);
     });
     $activity->execute($csmock);
     is $parentAsset->getId, $cs_id, 'add as new thread to current cs if reply to post in another CS';
+    WebGUI::Test->unmockAssetId($post2_id);
 }
 
 {
-    local *WebGUI::Asset::newByDynamicClass = sub {
-        return $postmock;
-    };
+    WebGUI::Test->mockAssetId($post_id, $postmock);
     $getmock->set_series('getNextMessage', {
         from => 'admin@localhost',
         parts => ['parts'],
@@ -144,6 +140,7 @@ $post2mock->set_always('getId', $post2_id);
     });
     $activity->execute($csmock);
     is $parentAsset->getId, $post_id, 'add as reply to post if reply to post in current CS';
+    WebGUI::Test->unmockAssetId($post_id);
 }
 
 #----------------------------------------------------------------------------
diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm
index bdb10bcdf..e08fb1ff1 100644
--- a/t/lib/WebGUI/Test.pm
+++ b/t/lib/WebGUI/Test.pm
@@ -264,6 +264,100 @@ END {
     }
 }
 
+=head2 mockAssetId ( $assetId, $object )
+
+Causes WebGUI::Asset->new* initializers to return the specified
+object instead of retreiving it from the database for the given
+asset ID.
+
+=cut
+
+my %mockedAssetIds;
+sub mockAssetId {
+    my ($class, $assetId, $object) = @_;
+    _mockAssetInits();
+    $mockedAssetIds{$assetId} = $object;
+}
+
+=head2 unmockAssetId ( $assetId )
+
+Removes a given asset ID from being mocked.
+
+=cut
+
+sub unmockAssetId {
+    my ($class, $assetId) = @_;
+    delete $mockedAssetIds{$assetId};
+}
+
+=head2 mockAssetUrl ( $url, $object )
+
+Causes WebGUI::Asset->newByUrl to return the specified object instead
+of retreiving it from the database for the given URL.
+
+=cut
+
+my %mockedAssetUrls;
+sub mockAssetUrl {
+    my ($url, $object) = @_;
+    _mockAssetInits();
+    $mockedAssetUrls{$url} = $object;
+}
+
+=head2 unmockAssetUrl ( $url )
+
+Removes a given asset URL from being mocked.
+
+=cut
+
+sub unmockAssetUrl {
+    my ($class, $url) = @_;
+    delete $mockedAssetUrls{$url};
+}
+
+my $mockedNew;
+sub _mockAssetInits {
+    no warnings 'redefine';
+
+    return
+        if $mockedNew;
+    require WebGUI::Asset;
+    my $original_new = \&WebGUI::Asset::new;
+    *WebGUI::Asset::new = sub {
+        my ($class, $session, $assetId, $className, $revisionDate) = @_;
+        if ($mockedAssetIds{$assetId}) {
+            return $mockedAssetIds{$assetId};
+        }
+        goto $original_new;
+    };
+    my $original_newByDynamicClass = \&WebGUI::Asset::newByDynamicClass;
+    *WebGUI::Asset::newByDynamicClass = sub {
+        my ($class, $session, $assetId, $revisionDate) = @_;
+        if ($mockedAssetIds{$assetId}) {
+            return $mockedAssetIds{$assetId};
+        }
+        goto $original_newByDynamicClass;
+    };
+    my $original_newPending = \&WebGUI::Asset::newPending;
+    *WebGUI::Asset::newPending = sub {
+        my ($class, $session, $assetId, $revisionDate) = @_;
+        if ($mockedAssetIds{$assetId}) {
+            return $mockedAssetIds{$assetId};
+        }
+        goto $original_newPending;
+    };
+    my $original_newByUrl = \&WebGUI::Asset::newByUrl;
+    *WebGUI::Asset::newByUrl = sub {
+        my ($class, $session, $url, $revisionDate) = @_;
+        if ($mockedAssetUrls{$url}) {
+            return $mockedAssetUrls{$url};
+        }
+        goto $original_newByUrl;
+    };
+
+    $mockedNew = 1;
+}
+
 #----------------------------------------------------------------------------
 
 =head2 interceptLogging