revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-03-31 14:38:15 +02:00
Code Issues Releases Wiki Activity

Fix a couple of column editing issues

Browse source 
Summary:
Ref T10349.

  - Don't show subproject columns on "Manage Board".
  - Fix "Edit Column" for milestone columns (allows you to set points, but not rename).

Test Plan:
  - Viewed "Manage Board" on a project with subprojects.
  - Edited a milestone column and set a point limit.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10349

Differential Revision: https://secure.phabricator.com/D15338
This commit is contained in:
epriestley 2016-02-23 14:41:36 -08:00
parent ee6070a984
commit 9baae00fbd
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/applications/project/controller/PhabricatorProjectBoardManageController.php
View file

@ -152,6 +152,11 @@ final class PhabricatorProjectBoardManageController
foreach ($columns as $column) { foreach ($columns as $column) {
$column_id = $column->getID(); $column_id = $column->getID();
$proxy = $column->getProxy();
if ($proxy && !$proxy->isMilestone()) {
continue;
}
$detail_uri = "/project/board/{$board_id}/column/{$column_id}/"; $detail_uri = "/project/board/{$board_id}/column/{$column_id}/";
$item = id(new PHUIObjectItemView()) $item = id(new PHUIObjectItemView())

6
src/applications/project/controller/PhabricatorProjectColumnEditController.php
View file

@ -81,14 +81,15 @@ final class PhabricatorProjectColumnEditController
$xactions = array(); $xactions = array();
$type_name = PhabricatorProjectColumnTransaction::TYPE_NAME;
$type_limit = PhabricatorProjectColumnTransaction::TYPE_LIMIT;
if (!$column->getProxy()) { if (!$column->getProxy()) {
$type_name = PhabricatorProjectColumnTransaction::TYPE_NAME;
$xactions[] = id(new PhabricatorProjectColumnTransaction()) $xactions[] = id(new PhabricatorProjectColumnTransaction())
->setTransactionType($type_name) ->setTransactionType($type_name)
->setNewValue($v_name); ->setNewValue($v_name);
} }
$type_limit = PhabricatorProjectColumnTransaction::TYPE_LIMIT;
$xactions[] = id(new PhabricatorProjectColumnTransaction()) $xactions[] = id(new PhabricatorProjectColumnTransaction())
->setTransactionType($type_limit) ->setTransactionType($type_limit)
->setNewValue($v_limit); ->setNewValue($v_limit);
@ -97,6 +98,7 @@ final class PhabricatorProjectColumnEditController
$editor = id(new PhabricatorProjectColumnTransactionEditor()) $editor = id(new PhabricatorProjectColumnTransactionEditor())
->setActor($viewer) ->setActor($viewer)
->setContinueOnNoEffect(true) ->setContinueOnNoEffect(true)
->setContinueOnMissingFields(true)
->setContentSourceFromRequest($request) ->setContentSourceFromRequest($request)
->applyTransactions($column, $xactions); ->applyTransactions($column, $xactions);
return id(new AphrontRedirectResponse())->setURI($view_uri); return id(new AphrontRedirectResponse())->setURI($view_uri);