fixed #10544: Child assets under uncommitted parents

plainblack · Oct 2, 2009 · 5c03cfb · 5c03cfb
1 parent 8f7d016
commit 5c03cfb
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 38 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -33,6 +33,7 @@
  - fixed #11067: My Purchases Detail Template - Status Message broken
  - fixed #11081: Prop style in 7.8.0?
  - fixed #11083: TGC template bug fixes, round #1
+ - fixed #10544: Child assets under uncommitted parents
 
 7.8.0
  - upgraded YUI to 2.8.0r4

diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
@@ -85,7 +85,8 @@ sub addChild {
 	$properties->{assetId} = $id;
 	$properties->{parentId} = $self->getId;
 	my $temp = WebGUI::Asset->newByPropertyHashRef($self->session,$properties) || croak "Couldn't create a new $properties->{className} asset!";
-	$temp->{_parent} = $self;
+        # Do not set the parent here, since it could be stale and poison the child
+	#$temp->{_parent} = $self;
 	my $newAsset = $temp->addRevision($properties, $now, $options); 
 	$self->updateHistory("added child ".$id);
 	$self->session->http->setStatus(201,"Asset Creation Successful");

diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
@@ -101,7 +101,16 @@ sub addRevision {
             } ); 
     }
     else {
-        $workingTag = WebGUI::VersionTag->getWorking($self->session);
+        my $parentAsset;
+        if ( not defined( $parentAsset = $self->getParent ) ) {
+            $parentAsset = WebGUI::Asset->newPending( $self->session, $self->get('parentId') );
+        }
+        if ( $parentAsset->hasBeenCommitted ) {
+            $workingTag = WebGUI::VersionTag->getWorking( $self->session );
+        }
+        else {
+            $workingTag = WebGUI::VersionTag->new( $self->session, $parentAsset->get('tagId') );
+        }
     }
 
     #Create a dummy revision to be updated with real data later

diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
@@ -815,67 +815,83 @@ is($iufpAsset2->get('url'), 'inheriturlfromparent01/iufp2', '... update works pr
 
 ################################################################
 #
-# requestAutoCommit to move uncommitted child to uncommitted parent
+# addRevision to uncommitted child of uncommitted parent
 #
 ################################################################
 
 my $versionTag5 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag5);
-$versionTag5->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt1' } );
+$versionTag5->set( { name => 'move revision of uncommitted child to uncommitted parent tests vt1' } );
 
 $properties = {
+
     #              '1234567890123456789012'
-    id          => 'moveVersionToParent_01',
-    title       => 'moveVersionToParent_01',
-    className   => 'WebGUI::Asset::Wobject::Layout',
-    url         => 'moveVersionToParent_01',
+    id        => 'moveVersionToParent_01',
+    title     => 'moveVersionToParent_01',
+    className => 'WebGUI::Asset::Wobject::Layout',
+    url       => 'moveVersionToParent_01',
 };
 
-my $parentAsset = $defaultAsset->addChild($properties, $properties->{id});
-my $parentVersionTag = WebGUI::VersionTag->new($session, $parentAsset->get('tagId'));
-is($parentVersionTag->get('isCommitted'),0, 'built non-committed parent asset');
+my $parentAsset = $defaultAsset->addChild( $properties, $properties->{id}, undef, { skipAutoCommitWorkflows => 1 } );
+my $parentVersionTag = WebGUI::VersionTag->new( $session, $parentAsset->get('tagId') );
+is( $parentVersionTag->get('isCommitted'), 0, 'built non-committed parent asset' );
 
-
-my $versionTag6 = WebGUI::VersionTag->create($session, {});
-WebGUI::Test->tagsToRollback($versionTag6);
-$versionTag6->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt2' } );
+my $versionTag6 = WebGUI::VersionTag->create( $session, {} );
+$versionTag6->set( { name => 'move revision of uncommitted child to uncommitted parent tests vt2' } );
 $versionTag6->setWorking;
 
 $properties2 = {
+
     #              '1234567890123456789012'
-    id          => 'moveVersionToParent_03',
-    title       => 'moveVersionToParent_03',
-    className   => 'WebGUI::Asset::Wobject::Layout',
-    url         => 'moveVersionToParent_03',
+    id        => 'moveVersionToParent_03',
+    title     => 'moveVersionToParent_03',
+    className => 'WebGUI::Asset::Wobject::Layout',
+    url       => 'moveVersionToParent_03',
 };
 
-my $childAsset = $parentAsset->addChild($properties, $properties2->{id});
-my $testAsset = WebGUI::Asset->newPending($session, $childAsset->get('parentId'));
-my $testVersionTag = WebGUI::VersionTag->new($session, $testAsset->get('tagId'));
+my $childAsset = $parentAsset->addChild(
+    $properties2, $properties2->{id},
+    $session->datetime->time(),
+    { skipAutoCommitWorkflows => 1 }
+);
+my $testAsset      = WebGUI::Asset->newPending( $session, $childAsset->get('parentId') );
+my $testVersionTag = WebGUI::VersionTag->new( $session,   $testAsset->get('tagId') );
 
 my $childVersionTag;
-$childVersionTag = WebGUI::VersionTag->new($session, $childAsset->get('tagId'));
-is($childVersionTag->get('isCommitted'),0, 'built non-committed child asset');
+$childVersionTag = WebGUI::VersionTag->new( $session, $childAsset->get('tagId') );
+is( $childVersionTag->get('isCommitted'), 0, 'built non-committed child asset' );
 
-isnt($testAsset->get('tagId'),$childAsset->get('tagId'),'parent asset and child asset have different version tags');
-isnt($testVersionTag->getId,$childVersionTag->getId,'parent asset and child asset version tags unmatched');
+is( $testAsset->get('tagId'),
+    $childAsset->get('tagId'),
+    'uncommitted parent asset and uncommitted child asset have same version tag at addChild'
+);
 
-eval {
-    $childAsset->requestAutoCommit;
-    $childVersionTag = WebGUI::VersionTag->new($session, $childAsset->get('tagId'));
+$properties2 = {
+
+    #              '1234567890123456789012'
+    id        => 'moveVersionToParent_03',
+    title     => 'moveVersionToParent_03a',
+    className => 'WebGUI::Asset::Wobject::Layout',
+    url       => 'moveVersionToParent_03a',
 };
-is($childVersionTag->get('isCommitted'),0, 'confirm non-committed child asset');
+sleep 2;
+$childAsset->addRevision( $properties2, $session->datetime->time(), { skipAutoCommitWorkflows => 1 } );
 
-is($testAsset->get('tagId'),$childAsset->get('tagId'),'parent asset and child asset have same version tags');
+is( $parentVersionTag->get('isCommitted'), 0, 'confimr non-committed parent asset after revision' );
+is( $childVersionTag->get('isCommitted'),  0, 'confirm non-committed child asset after revision' );
 
-eval {
-    $testVersionTag->commit;
-};
+is( $testAsset->get('tagId'),
+    $childAsset->get('tagId'),
+    'uncommitted parent asset and uncommitted child asset have same version tag after addRevision'
+);
+
+eval { $testVersionTag->commit; };
 
-is($testVersionTag->get('isCommitted'),1,'parent asset is now committed');
+$session->log->warn('parent asset is now committed');
+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');
+$childVersionTag = WebGUI::VersionTag->new( $session, $childAsset->get('tagId') );
+$session->log->warn('child asset is now committed');
+is( $childVersionTag->get('isCommitted'), 1, 'child asset is now committed' );
 
 ################################################################
 #