Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225208
Change subject: fixes ActionList non-object bug
......................................................................
fixes ActionList non-object bug
Bug: T106012
Change-Id: I32bce28bbf27f69e90f01c8c8356bc6258a5bc5e
---
M src/events/BurndownActionMenuEventListener.php
1 file changed, 32 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/08/225208/1
diff --git a/src/events/BurndownActionMenuEventListener.php
b/src/events/BurndownActionMenuEventListener.php
index 962c553..9b29fee 100644
--- a/src/events/BurndownActionMenuEventListener.php
+++ b/src/events/BurndownActionMenuEventListener.php
@@ -21,11 +21,14 @@
private function handleActionsEvent(PhutilEvent $event) {
$object = $event->getValue('object');
-
+ $enable_phragile = PhabricatorEnv::getEnvConfig('sprint.enable-phragile');
$actions = null;
if ($object instanceof PhabricatorProject &&
- $this->isSprint($object) !== false) {
+ $this->isSprint($object) !== false && $enable_phragile === false) {
$actions = $this->renderUserItems($event);
+ } else if ($object instanceof PhabricatorProject &&
+ $this->isSprint($object) !== false && $enable_phragile !== false) {
+ $actions = $this->renderOptionItems($event);
}
$this->addActionMenuItems($event, $actions);
@@ -42,13 +45,12 @@
if (!$this->canUseApplication($event->getUser())) {
return null;
}
- $enable_phragile = PhabricatorEnv::getEnvConfig('sprint.enable-phragile');
+
$project = $event->getValue('object');
$projectid = $project->getId();
$view_uri = '/project/sprint/view/'.$projectid;
$board_uri = '/project/sprint/board/'.$projectid;
- $phragile_uri = 'https://phragile.wmflabs.org/sprints/'.$projectid;
$burndown = id(new PhabricatorActionView())
->setIcon('fa-bar-chart-o')
@@ -60,18 +62,36 @@
->setName(pht('View Sprint Board'))
->setHref($board_uri);
- $phragile = null;
- if ($enable_phragile) {
- $phragile = id(new PhabricatorActionView())
+ return array ($burndown, $board);
+ }
+
+ private function renderOptionItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
+ $project = $event->getValue('object');
+ $projectid = $project->getId();
+
+ $phragile_uri = 'https://phragile.wmflabs.org/sprints/'.$projectid;
+ $view_uri = '/project/sprint/view/'.$projectid;
+ $board_uri = '/project/sprint/board/'.$projectid;
+
+ $burndown = id(new PhabricatorActionView())
+ ->setIcon('fa-bar-chart-o')
+ ->setName(pht('View Burndown'))
+ ->setHref($view_uri);
+
+ $board = id(new PhabricatorActionView())
+ ->setIcon('fa-columns')
+ ->setName(pht('View Sprint Board'))
+ ->setHref($board_uri);
+
+ $phragile = id(new PhabricatorActionView())
->setIcon('fa-pie-chart')
->setName(pht('View in Phragile'))
->setHref($phragile_uri);
- }
-
return array ($burndown, $board, $phragile);
}
-
-
-
}
--
To view, visit https://gerrit.wikimedia.org/r/225208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32bce28bbf27f69e90f01c8c8356bc6258a5bc5e
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
