From 96b1665eaa12580b86ed936fc0822961359163a6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 10 Jan 2016 10:05:59 -0800
Subject: [PATCH] Link "continue" action to confirm dialog in bulk jobs that
 are unconfirmed

Summary: See Q266.

Test Plan: Created a bulk job, clicked "Details" instead of "Confirm", clicked "Continue" to get back to confirmation dialog.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D14985
---
 .../controller/PhabricatorDaemonBulkJobViewController.php | 8 +++++++-
 .../daemon/workers/storage/PhabricatorWorkerBulkJob.php   | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php b/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
index 6fc3af724e..f32892cf4c 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
@@ -71,9 +71,15 @@ final class PhabricatorDaemonBulkJobViewController
       ->setUser($viewer)
       ->setObject($job);
 
+    if ($job->isConfirming()) {
+      $continue_uri = $job->getMonitorURI();
+    } else {
+      $continue_uri = $job->getDoneURI();
+    }
+
     $actions->addAction(
       id(new PhabricatorActionView())
-        ->setHref($job->getDoneURI())
+        ->setHref($continue_uri)
         ->setIcon('fa-arrow-circle-o-right')
         ->setName(pht('Continue')));
 
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
index 7eed0240eb..20d981c576 100644
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
@@ -130,6 +130,10 @@ final class PhabricatorWorkerBulkJob
     return idx($map, $this->getStatus(), $this->getStatus());
   }
 
+  public function isConfirming() {
+    return ($this->getStatus() == self::STATUS_CONFIRM);
+  }
+
 
 /* -(  Job Implementation  )------------------------------------------------- */