Page MenuHomePhabricator
Files F13175343

D14670.diff
No OneTemporary
Actions

D14670.diff
View Options

diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -60,10 +60,6 @@
$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
- // TODO: Restore these or toss them:
- // - When closing an unassigned task, assign the closing user.
- // - Make sure implicit CCs on actions are working reasonably.
-
if ($object->isClosed()) {
$priority_label = null;
$owner_label = null;
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -745,5 +745,79 @@
return $errors;
}
+ protected function expandTransactions(
+ PhabricatorLiskDAO $object,
+ array $xactions) {
+ $results = parent::expandTransactions($object, $xactions);
+
+ $is_unassigned = ($object->getOwnerPHID() === null);
+
+ $any_assign = false;
+ foreach ($xactions as $xaction) {
+ if ($xaction->getTransactionType() == ManiphestTransaction::TYPE_OWNER) {
+ $any_assign = true;
+ break;
+ }
+ }
+
+ $is_open = !$object->isClosed();
+
+ $new_status = null;
+ foreach ($xactions as $xaction) {
+ switch ($xaction->getTransactionType()) {
+ case ManiphestTransaction::TYPE_STATUS:
+ $new_status = $xaction->getNewValue();
+ break;
+ }
+ }
+
+ if ($new_status === null) {
+ $is_closing = false;
+ } else {
+ $is_closing = ManiphestTaskStatus::isClosedStatus($new_status);
+ }
+
+ // If the task is not assigned, not being assigned, currently open, and
+ // being closed, try to assign the actor as the owner.
+ if ($is_unassigned && !$any_assign && $is_open && $is_closing) {
+ // Don't assign the actor if they aren't a real user.
+ $actor = $this->getActor();
+ $actor_phid = $actor->getPHID();
+ if ($actor_phid) {
+ $results[] = id(new ManiphestTransaction())
+ ->setTransactionType(ManiphestTransaction::TYPE_OWNER)
+ ->setNewValue($actor_phid);
+ }
+ }
+
+ return $results;
+ }
+
+ protected function expandTransaction(
+ PhabricatorLiskDAO $object,
+ PhabricatorApplicationTransaction $xaction) {
+
+ $results = parent::expandTransaction($object, $xaction);
+
+ switch ($xaction->getTransactionType()) {
+ case ManiphestTransaction::TYPE_OWNER:
+ // When a task is reassigned, move the old owner to the subscriber
+ // list so they're still in the loop.
+ $owner_phid = $object->getOwnerPHID();
+ if ($owner_phid) {
+ $results[] = id(new ManiphestTransaction())
+ ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
+ ->setIgnoreOnNoEffect(true)
+ ->setNewValue(
+ array(
+ '+' => array($owner_phid => $owner_phid),
+ ));
+ }
+ break;
+ }
+
+ return $results;
+ }
+
}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1369,7 +1369,7 @@
* resigning from a revision in Differential implies removing yourself as
* a reviewer.
*/
- private function expandTransactions(
+ protected function expandTransactions(
PhabricatorLiskDAO $object,
array $xactions) {

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 4:40 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6274053
Default Alt Text
D14670.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility