[MediaWiki-commits] [Gerrit] updates to upstream 5 Oct 4d5278af1148f211d52244e3fb61712ed2... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: updates to upstream 5 Oct
4d5278af1148f211d52244e3fb61712ed24b9d1f
..
updates to upstream 5 Oct 4d5278af1148f211d52244e3fb61712ed24b9d1f
Bug:T110443
Change-Id: Iaa98d82fb9eb1c7577f95eea3361b2ef68a8100f
---
M src/controller/board/SprintBoardColumnDetailController.php
M src/controller/board/SprintBoardColumnEditController.php
M src/controller/board/SprintBoardColumnHideController.php
M src/controller/board/SprintBoardMoveController.php
M src/controller/board/SprintBoardReorderController.php
M src/controller/board/SprintBoardViewController.php
M src/view/SprintUIObjectBoxView.php
7 files changed, 162 insertions(+), 170 deletions(-)
Approvals:
jenkins-bot: Verified
diff --git a/src/controller/board/SprintBoardColumnDetailController.php
b/src/controller/board/SprintBoardColumnDetailController.php
index 5b06486..b0e28a8 100644
--- a/src/controller/board/SprintBoardColumnDetailController.php
+++ b/src/controller/board/SprintBoardColumnDetailController.php
@@ -40,7 +40,7 @@
new PhabricatorProjectColumnTransactionQuery());
$timeline->setShouldTerminate(true);
-$title = pht('%s', $column->getDisplayName());
+$title = $column->getDisplayName();
$header = $this->buildHeaderView($column);
$actions = $this->buildActionView($column);
@@ -112,15 +112,6 @@
->setUser($viewer)
->setObject($column)
->setActionList($actions);
-
-$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
- $viewer,
- $column);
-
-$properties->addProperty(
- pht('Editable By'),
- $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
-
$limit = $column->getPointLimit();
$properties->addProperty(
diff --git a/src/controller/board/SprintBoardColumnEditController.php
b/src/controller/board/SprintBoardColumnEditController.php
index 9233f7a..afd2ea5 100644
--- a/src/controller/board/SprintBoardColumnEditController.php
+++ b/src/controller/board/SprintBoardColumnEditController.php
@@ -15,7 +15,7 @@
PhabricatorPolicyCapability::CAN_VIEW,
PhabricatorPolicyCapability::CAN_EDIT,
))
- ->withIDs(array($project_id ))
+ ->withIDs(array($project_id))
->needImages(true)
->executeOne();
@@ -148,7 +148,7 @@
$nav->appendChild($form_box);
return $this->buildApplicationPage(
-$nav,
+ $nav,
array(
'title' => $title,
));
diff --git a/src/controller/board/SprintBoardColumnHideController.php
b/src/controller/board/SprintBoardColumnHideController.php
index 6966ef5..cc3f6f5 100644
--- a/src/controller/board/SprintBoardColumnHideController.php
+++ b/src/controller/board/SprintBoardColumnHideController.php
@@ -61,9 +61,9 @@
$type_status = PhabricatorProjectColumnTransaction::TYPE_STATUS;
$xactions = array(
- id(new PhabricatorProjectColumnTransaction())
- ->setTransactionType($type_status)
- ->setNewValue($new_status),
+id(new PhabricatorProjectColumnTransaction())
+ ->setTransactionType($type_status)
+ ->setNewValue($new_status),
);
$editor = id(new PhabricatorProjectColumnTransactionEditor())
diff --git a/src/controller/board/SprintBoardMoveController.php
b/src/controller/board/SprintBoardMoveController.php
index 411876f..45cd4cf 100644
--- a/src/controller/board/SprintBoardMoveController.php
+++ b/src/controller/board/SprintBoardMoveController.php
@@ -95,22 +95,22 @@
if ($task_phids && ($order == PhabricatorProjectColumn::ORDER_PRIORITY)) {
$tasks = id(new ManiphestTaskQuery())
- ->setViewer($viewer)
- ->withPHIDs($task_phids)
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->execute();
+->setViewer($viewer)
+->withPHIDs($task_phids)
+->requireCapabilities(
+ array(
+PhabricatorPolicyCapability::CAN_VIEW,
+PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+->execute();
if (count($tasks) != count($task_phids)) {
return new Aphront404Response();
}
$tasks = mpull($tasks, null, 'getPHID');
$try = array(
- array($after_phid, true),
- array($before_phid, false),
+array($after_phid, true),
+array($before_phid, false),
);
$pri = null;
@@ -120,21 +120,21 @@
$task = idx($tasks, $task_phid);
if ($task) {
list($pri, $sub) =
ManiphestTransactionEditor::getAdjacentSubpriority(
- $task,
- $is_after);
+$task,
+$is_after);
break;
}
}
if ($pri !== null) {
$xactions[] =
[MediaWiki-commits] [Gerrit] updates to upstream 5 Oct 4d5278af1148f211d52244e3fb61712ed2... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243914
Change subject: updates to upstream 5 Oct
4d5278af1148f211d52244e3fb61712ed24b9d1f
..
updates to upstream 5 Oct 4d5278af1148f211d52244e3fb61712ed24b9d1f
Bug:T110443
Change-Id: Iaa98d82fb9eb1c7577f95eea3361b2ef68a8100f
---
M src/controller/board/SprintBoardColumnDetailController.php
M src/controller/board/SprintBoardColumnEditController.php
M src/controller/board/SprintBoardColumnHideController.php
M src/controller/board/SprintBoardMoveController.php
M src/controller/board/SprintBoardReorderController.php
M src/controller/board/SprintBoardViewController.php
M src/view/SprintUIObjectBoxView.php
7 files changed, 162 insertions(+), 170 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/14/243914/1
diff --git a/src/controller/board/SprintBoardColumnDetailController.php
b/src/controller/board/SprintBoardColumnDetailController.php
index 5b06486..b0e28a8 100644
--- a/src/controller/board/SprintBoardColumnDetailController.php
+++ b/src/controller/board/SprintBoardColumnDetailController.php
@@ -40,7 +40,7 @@
new PhabricatorProjectColumnTransactionQuery());
$timeline->setShouldTerminate(true);
-$title = pht('%s', $column->getDisplayName());
+$title = $column->getDisplayName();
$header = $this->buildHeaderView($column);
$actions = $this->buildActionView($column);
@@ -112,15 +112,6 @@
->setUser($viewer)
->setObject($column)
->setActionList($actions);
-
-$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
- $viewer,
- $column);
-
-$properties->addProperty(
- pht('Editable By'),
- $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
-
$limit = $column->getPointLimit();
$properties->addProperty(
diff --git a/src/controller/board/SprintBoardColumnEditController.php
b/src/controller/board/SprintBoardColumnEditController.php
index 9233f7a..afd2ea5 100644
--- a/src/controller/board/SprintBoardColumnEditController.php
+++ b/src/controller/board/SprintBoardColumnEditController.php
@@ -15,7 +15,7 @@
PhabricatorPolicyCapability::CAN_VIEW,
PhabricatorPolicyCapability::CAN_EDIT,
))
- ->withIDs(array($project_id ))
+ ->withIDs(array($project_id))
->needImages(true)
->executeOne();
@@ -148,7 +148,7 @@
$nav->appendChild($form_box);
return $this->buildApplicationPage(
-$nav,
+ $nav,
array(
'title' => $title,
));
diff --git a/src/controller/board/SprintBoardColumnHideController.php
b/src/controller/board/SprintBoardColumnHideController.php
index 6966ef5..cc3f6f5 100644
--- a/src/controller/board/SprintBoardColumnHideController.php
+++ b/src/controller/board/SprintBoardColumnHideController.php
@@ -61,9 +61,9 @@
$type_status = PhabricatorProjectColumnTransaction::TYPE_STATUS;
$xactions = array(
- id(new PhabricatorProjectColumnTransaction())
- ->setTransactionType($type_status)
- ->setNewValue($new_status),
+id(new PhabricatorProjectColumnTransaction())
+ ->setTransactionType($type_status)
+ ->setNewValue($new_status),
);
$editor = id(new PhabricatorProjectColumnTransactionEditor())
diff --git a/src/controller/board/SprintBoardMoveController.php
b/src/controller/board/SprintBoardMoveController.php
index 411876f..45cd4cf 100644
--- a/src/controller/board/SprintBoardMoveController.php
+++ b/src/controller/board/SprintBoardMoveController.php
@@ -95,22 +95,22 @@
if ($task_phids && ($order == PhabricatorProjectColumn::ORDER_PRIORITY)) {
$tasks = id(new ManiphestTaskQuery())
- ->setViewer($viewer)
- ->withPHIDs($task_phids)
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->execute();
+->setViewer($viewer)
+->withPHIDs($task_phids)
+->requireCapabilities(
+ array(
+PhabricatorPolicyCapability::CAN_VIEW,
+PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+->execute();
if (count($tasks) != count($task_phids)) {
return new Aphront404Response();
}
$tasks = mpull($tasks, null, 'getPHID');
$try = array(
- array($after_phid, true),
- array($before_phid, false),
+array($after_phid, true),
+array($before_phid, false),
);
$pri = null;
@@ -120,21 +120,21 @@
$task = idx($tasks, $task_phid);
if ($task) {
list($pri, $sub) =
ManiphestTransactionEditor::getAdjacentSubpriority(
- $task,
- $is_after);
+$task,
+$is_a
