Skip to content

Commit 95df771

Browse files
lkassianikepriestley
lkassianik
authored and
epriestley
committedNov 12, 2014
Ref T6500, Duplicated tasks should be marked more visibly as duplicates
Summary: When merging tasks, the corresponding transaction on the merged task should be black, and the transaction on the ultimate task should be green. Test Plan: Create two tasks, merge one into the other, merged task transaction is black, the surviving task should show a green transaction. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: chad, Korvin, epriestley Maniphest Tasks: T6500 Differential Revision: https://secure.phabricator.com/D10827
1 parent 36c46d8 commit 95df771

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed
 

‎src/applications/maniphest/storage/ManiphestTransaction.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ public function getColor() {
213213
return 'yellow';
214214
}
215215

216+
case self::TYPE_MERGED_FROM:
217+
return 'orange';
218+
219+
case self::TYPE_MERGED_INTO:
220+
return 'black';
216221
}
217222

218223
return parent::getColor();
@@ -591,7 +596,7 @@ public function getTitle() {
591596

592597
case self::TYPE_MERGED_INTO:
593598
return pht(
594-
'%s merged this task into %s.',
599+
'%s closed this task as a duplicate of %s.',
595600
$this->renderHandleLink($author_phid),
596601
$this->renderHandleLink($new));
597602
break;

0 commit comments

Comments
 (0)
Failed to load comments.