Page MenuHomePhabricator
Files F15378116

D15635.id.diff
No OneTemporary
Actions

D15635.id.diff
View Options

diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -256,6 +256,15 @@
$phids[] = ipull($old, 'dst');
$phids[] = ipull($new, 'dst');
break;
+ case PhabricatorTransactions::TYPE_COLUMNS:
+ foreach ($new as $move) {
+ $phids[] = array(
+ $move['columnPHID'],
+ $move['boardPHID'],
+ );
+ $phids[] = $move['fromColumnPHIDs'];
+ }
+ break;
case PhabricatorTransactions::TYPE_EDIT_POLICY:
case PhabricatorTransactions::TYPE_VIEW_POLICY:
case PhabricatorTransactions::TYPE_JOIN_POLICY:
@@ -407,6 +416,8 @@
return 'fa-trophy';
case PhabricatorTransactions::TYPE_SPACE:
return 'fa-th-large';
+ case PhabricatorTransactions::TYPE_COLUMNS:
+ return 'fa-columns';
}
return 'fa-pencil';
@@ -493,6 +504,7 @@
case PhabricatorTransactions::TYPE_EDIT_POLICY:
case PhabricatorTransactions::TYPE_JOIN_POLICY:
case PhabricatorTransactions::TYPE_SPACE:
+ case PhabricatorTransactions::TYPE_COLUMNS:
break;
default:
$old = $this->getOldValue();
@@ -501,9 +513,10 @@
return true;
}
- if (!strlen($old)) {
+ if (!is_array($old) && !strlen($old)) {
return true;
}
+
break;
}
}
@@ -549,6 +562,8 @@
if ($field) {
return $field->shouldHideInApplicationTransactions($this);
}
+ case PhabricatorTransactions::TYPE_COLUMNS:
+ return !$this->getInterestingMoves($this->getNewValue());
case PhabricatorTransactions::TYPE_EDGE:
$edge_type = $this->getMetadataValue('edge:type');
switch ($edge_type) {
@@ -930,6 +945,44 @@
}
break;
+ case PhabricatorTransactions::TYPE_COLUMNS:
+ $moves = $this->getInterestingMoves($new);
+ if (count($moves) == 1) {
+ $move = head($moves);
+ $from_columns = $move['fromColumnPHIDs'];
+ $to_column = $move['columnPHID'];
+ $board_phid = $move['boardPHID'];
+ if (count($from_columns) == 1) {
+ return pht(
+ '%s moved this task from %s to %s on the %s board.',
+ $this->renderHandleLink($author_phid),
+ $this->renderHandleLink(head($from_columns)),
+ $this->renderHandleLink($to_column),
+ $this->renderHandleLink($board_phid));
+ } else {
+ return pht(
+ '%s moved this task to %s on the %s board.',
+ $this->renderHandleLink($author_phid),
+ $this->renderHandleLink($to_column),
+ $this->renderHandleLink($board_phid));
+ }
+ } else {
+ $fragments = array();
+ foreach ($moves as $move) {
+ $fragments[] = pht(
+ '%s (%s)',
+ $this->renderHandleLink($board_phid),
+ $this->renderHandleLink($to_column));
+ }
+
+ return pht(
+ '%s moved this task on %s board(s): %s.',
+ $this->renderHandleLink($author_phid),
+ phutil_count($moves),
+ phutil_implode_html(', ', $fragments));
+ }
+ break;
+
default:
return pht(
'%s edited this %s.',
@@ -1058,6 +1111,47 @@
return null;
}
+ case PhabricatorTransactions::TYPE_COLUMNS:
+ $moves = $this->getInterestingMoves($new);
+ if (count($moves) == 1) {
+ $move = head($moves);
+ $from_columns = $move['fromColumnPHIDs'];
+ $to_column = $move['columnPHID'];
+ $board_phid = $move['boardPHID'];
+ if (count($from_columns) == 1) {
+ return pht(
+ '%s moved %s from %s to %s on the %s board.',
+ $this->renderHandleLink($author_phid),
+ $this->renderHandleLink($object_phid),
+ $this->renderHandleLink(head($from_columns)),
+ $this->renderHandleLink($to_column),
+ $this->renderHandleLink($board_phid));
+ } else {
+ return pht(
+ '%s moved %s to %s on the %s board.',
+ $this->renderHandleLink($author_phid),
+ $this->renderHandleLink($object_phid),
+ $this->renderHandleLink($to_column),
+ $this->renderHandleLink($board_phid));
+ }
+ } else {
+ $fragments = array();
+ foreach ($moves as $move) {
+ $fragments[] = pht(
+ '%s (%s)',
+ $this->renderHandleLink($board_phid),
+ $this->renderHandleLink($to_column));
+ }
+
+ return pht(
+ '%s moved %s on %s board(s): %s.',
+ $this->renderHandleLink($author_phid),
+ $this->renderHandleLink($object_phid),
+ phutil_count($moves),
+ phutil_implode_html(', ', $fragments));
+ }
+ break;
+
}
return $this->getTitle();
@@ -1364,6 +1458,18 @@
return true;
}
+ private function getInterestingMoves(array $moves) {
+ // Remove moves which only shift the position of a task within a column.
+ foreach ($moves as $key => $move) {
+ $from_phids = array_fuse($move['fromColumnPHIDs']);
+ if (isset($from_phids[$move['columnPHID']])) {
+ unset($moves[$key]);
+ }
+ }
+
+ return $moves;
+ }
+
/* -( PhabricatorPolicyInterface Implementation )-------------------------- */

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 14, 12:58 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7657632
Default Alt Text
D15635.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility