From 22bf6e845141fa0e980e94641a73af7f83313d05 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 15 Oct 2011 13:52:15 -0700
Subject: [PATCH] Fix a bug in Fork where it would quit on the first lookup,
 whether or not the Fork was really done.  The variable for completeness is
 "current" instead of finished.

---
 lib/WebGUI/Fork/ProgressBar.pm     | 6 +++---
 lib/WebGUI/Operation/VersionTag.pm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Fork/ProgressBar.pm b/lib/WebGUI/Fork/ProgressBar.pm
index 844315cd3..4368d6c88 100644
--- a/lib/WebGUI/Fork/ProgressBar.pm
+++ b/lib/WebGUI/Fork/ProgressBar.pm
@@ -55,7 +55,7 @@ my $template = <<'TEMPLATE';
             url    : params.statusUrl,
             draw   : function (data) {
                 var status = YAHOO.lang.JSON.parse(data.status);
-                bar.update(status.finished, status.total);
+                bar.update(status.current, status.total);
                 document.getElementById('message').innerHTML = status.message;
                 document.getElementById('elapsed').innerHTML = data.elapsed;
             },
@@ -63,8 +63,8 @@ my $template = <<'TEMPLATE';
                 document.getElementById('loading').style.display = 'none';
                 document.getElementById('ui').style.display = 'block';
             },
-            finish : function() {
-                YAHOO.WebGUI.Fork.redirect(params.redirect);
+            finish : function(data) {
+                YAHOO.WebGUI.Fork.redirect(data.redirect || params.redirect);
             },
             error  : function (msg) {
                 alert(msg);
diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm
index a45d37a20..8a8ee697d 100644
--- a/lib/WebGUI/Operation/VersionTag.pm
+++ b/lib/WebGUI/Operation/VersionTag.pm
@@ -153,7 +153,7 @@ sub rollbackInFork {
     my $session = $process->session;
     my $tag = WebGUI::VersionTag->new( $session, $tagId );
     my %status = (
-        finished => 0,
+        current => 0,
         total    => $process->session->db->quickScalar( 'SELECT count(*) FROM assetData WHERE tagId = ?', [$tagId] ),
         message  => '',
     );
@@ -167,7 +167,7 @@ sub rollbackInFork {
             my $purgeRevision = shift;
             my $self          = shift;
             $self->$purgeRevision(@_);
-            $status{finished}++;
+            $status{current}++;
             $update->();
         }
     );