plainblack · Oct 26, 2011
diff --git a/‎docs/migration.txt
-9 b/‎docs/migration.txt
-9
diff --git a/‎lib/WebGUI/Asset.pm
+1-69 b/‎lib/WebGUI/Asset.pm
+1-69
@@ -281,15 +281,6 @@ processPropertiesFromFormPost
 -----------------------------
 Absurdly long and non-descriptive name, changed to processEditForm
 
-Versioning
-----------
-New revisions are not created in a "pending" state automatically. VersionTags
-are not created by calling addRevision(). If you want a revision to be part of
-a version tag, you must set 
-    status => "pending", 
-    tagId => $tag->getId,
-explicitly.
-
 Admin Controls
 --------------------
 The admin controls are now added to the asset with javascript. This javascript
 
@@ -2776,40 +2776,12 @@ sub www_addSave {
         return $self->session->style->userStyle($i18n->get("over max assets")) if ($self->session->config->get("maximumAssets") <= $count);
     }
 
-    # Determine what version tag we should use
-    my $autoCommitId  = $self->getAutoCommitWorkflowId();
-
-    my ($workingTag, $oldWorking);
-    if ( $autoCommitId ) {
-        $workingTag
-            = WebGUI::VersionTag->create( $session, { 
-                groupToUse  => '12',            # Turn Admin On (for lack of something better)
-                workflowId  => $autoCommitId,
-            } ); 
-    }
-    else {
-        my $parentAsset;
-        if ( not defined( $parentAsset = $self->getParent ) ) {
-            $parentAsset = WebGUI::Asset->newPending( $session, $self->parentId );
-        }
-        if ( $parentAsset->hasBeenCommitted ) {
-            $workingTag = WebGUI::VersionTag->getWorking( $session );
-        }
-        else {
-            $oldWorking = WebGUI::VersionTag->getWorking($session, 'noCreate');
-            $workingTag = WebGUI::VersionTag->new( $session, $parentAsset->tagId );
-            $workingTag->setWorking();
-        }
-    }
-
     # Add the new asset
     my $object;
     my $className   = $form->process('className','className') || $form->process('class','className');
     $object = $self->addChild({
         className   => $className,
         revisedBy   => $session->user->userId,
-        tagId       => $workingTag->getId,
-        status      => "pending",
     });
     if ( !defined $object ) {
         my $url = $session->url->page;
@@ -2819,11 +2791,6 @@ sub www_addSave {
     $object->{_parent} = $self;
     $object->url(undef);
 
-    # More version tag stuff
-    $object->setVersionLock;
-    $object->setAutoCommitTag($workingTag) if (defined $autoCommitId);
-    $oldWorking->setWorking if $oldWorking;
-
     # Process properties from form post
     my $errors = $object->processEditForm;
     if (ref $errors eq 'ARRAY') {
@@ -2924,43 +2891,8 @@ sub www_editSave {
     return $session->privilege->locked() unless $self->canEditIfLocked;
     return $session->privilege->insufficient() unless $self->canEdit;
 
-    # Determine what version tag we should use
-    my $autoCommitId  = $self->getAutoCommitWorkflowId();
-
-    my ($workingTag, $oldWorking);
-    if ( $autoCommitId ) {
-        $workingTag
-            = WebGUI::VersionTag->create( $session, { 
-                groupToUse  => '12',            # Turn Admin On (for lack of something better)
-                workflowId  => $autoCommitId,
-            } ); 
-    }
-    else {
-        my $parentAsset;
-        if ( not defined( $parentAsset = $self->getParent ) ) {
-            $parentAsset = WebGUI::Asset->newPending( $session, $self->parentId );
-        }
-        if ( $parentAsset->hasBeenCommitted ) {
-            $workingTag = WebGUI::VersionTag->getWorking( $session );
-        }
-        else {
-            $oldWorking = WebGUI::VersionTag->getWorking($session, 'noCreate');
-            $workingTag = WebGUI::VersionTag->new( $session, $parentAsset->tagId );
-            $workingTag->setWorking();
-        }
-    }
-
     # Add the new revision
-    my $object = $self->addRevision({
-        revisedBy   => $session->user->userId,
-        tagId       => $workingTag->getId,
-        status      => "pending",
-    });
-
-    # More version tag stuff
-    $object->setVersionLock;
-    $object->setAutoCommitTag($workingTag) if (defined $autoCommitId);
-    $oldWorking->setWorking if $oldWorking;
+    my $object = $self->addRevision();
 
     # Process properties from form post
     my $errors = $object->processEditForm;