diff --git a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php --- a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php +++ b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php @@ -98,14 +98,11 @@ ->setDrag(true); foreach ($columns as $column) { - // Don't allow milestone columns to be reordered. + // do allow milestone columns to be reordered. $proxy = $column->getProxy(); - if ($proxy && $proxy->isMilestone()) { - continue; - } // At least for now, don't show subproject column. - if ($proxy) { + if ($proxy && !$proxy->isMilestone()) { continue; } @@ -115,6 +112,8 @@ if ($column->isHidden()) { $item->setDisabled(true); + } elseif($proxy && $proxy->isMilestone()) { + $item->setTitleText(pht('Milestone')); } $item->setGrippable(true); diff --git a/src/applications/project/storage/PhabricatorProjectColumn.php b/src/applications/project/storage/PhabricatorProjectColumn.php --- a/src/applications/project/storage/PhabricatorProjectColumn.php +++ b/src/applications/project/storage/PhabricatorProjectColumn.php @@ -168,22 +168,7 @@ } public function getOrderingKey() { - $proxy = $this->getProxy(); - - // Normal columns and subproject columns go first, in a user-controlled - // order. - - // All the milestone columns go last, in their sequential order. - - if (!$proxy || !$proxy->isMilestone()) { - $group = 'A'; - $sequence = $this->getSequence(); - } else { - $group = 'B'; - $sequence = $proxy->getMilestoneNumber(); - } - - return sprintf('%s%012d', $group, $sequence); + return $this->getSequence(); } public function attachTrigger(PhabricatorProjectTrigger $trigger = null) {