From a95568e649d8c3b637b8cb0f342c04d3a101cc6c Mon Sep 17 00:00:00 2001
From: Christopher Johnson <christopher.johnson@wikimedia.de>
Date: Wed, 27 Jan 2016 00:27:05 +0100
Subject: [PATCH] updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc
Bug: T124385
Change-Id: I939544e0795da6c8f1db530e783f211591c948ac
---
.../SprintProjectProfilePanelEngine.php | 34 ++++++-------------
src/storage/SprintListDataProvider.php | 1 -
src/storage/TaskTableDataProvider.php | 2 --
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/src/engine/SprintProjectProfilePanelEngine.php b/src/engine/SprintProjectProfilePanelEngine.php
index ff191c5..ad305c2 100644
--- a/src/engine/SprintProjectProfilePanelEngine.php
+++ b/src/engine/SprintProjectProfilePanelEngine.php
@@ -3,6 +3,10 @@
final class SprintProjectProfilePanelEngine
extends PhabricatorProfilePanelEngine {
+ protected function isPanelEngineConfigurable() {
+ return true;
+ }
+
protected function getPanelURI($path) {
$project = $this->getProfileObject();
$id = $project->getID();
@@ -14,38 +18,20 @@ final class SprintProjectProfilePanelEngine
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_PROFILE)
- ->setPanelKey(SprintProjectDetailsProfilePanel::PANELKEY);
+ ->setPanelKey(PhabricatorProjectDetailsProfilePanel::PANELKEY);
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_WORKBOARD)
- ->setPanelKey(SprintProjectWorkboardProfilePanel::PANELKEY);
-
- $id = $object->getID();
- // TODO: This is temporary.
- $uri = urisprintf(
- '/maniphest/?statuses=open()&projects=%s#R',
- $object->getPHID());
-
- $panels[] = $this->newPanel()
- ->setBuiltinKey('tasks')
- ->setPanelKey(PhabricatorLinkProfilePanel::PANELKEY)
- ->setPanelProperty('icon', 'maniphest')
- ->setPanelProperty('name', pht('Open Tasks'))
- ->setPanelProperty('uri', $uri);
-
- // TODO: This is temporary.
-
- $panels[] = $this->newPanel()
- ->setBuiltinKey('feed')
- ->setPanelKey(PhabricatorLinkProfilePanel::PANELKEY)
- ->setPanelProperty('icon', 'feed')
- ->setPanelProperty('name', pht('Feed'))
- ->setPanelProperty('uri', "/project/feed/{$id}/");
+ ->setPanelKey(PhabricatorProjectWorkboardProfilePanel::PANELKEY);
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_MEMBERS)
->setPanelKey(PhabricatorProjectMembersProfilePanel::PANELKEY);
+ $panels[] = $this->newPanel()
+ ->setBuiltinKey(PhabricatorProject::PANEL_MANAGE)
+ ->setPanelKey(PhabricatorProjectManageProfilePanel::PANELKEY);
+
return $panels;
}
diff --git a/src/storage/SprintListDataProvider.php b/src/storage/SprintListDataProvider.php
index 8870e25..012e092 100644
--- a/src/storage/SprintListDataProvider.php
+++ b/src/storage/SprintListDataProvider.php
@@ -90,7 +90,6 @@ final class SprintListDataProvider {
private function getEditProjectDetailsIcon() {
$image = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-fire', 'orange')
->setText('Burndown');
return $image;
diff --git a/src/storage/TaskTableDataProvider.php b/src/storage/TaskTableDataProvider.php
index 692c20e..39439d1 100644
--- a/src/storage/TaskTableDataProvider.php
+++ b/src/storage/TaskTableDataProvider.php
@@ -243,7 +243,6 @@ final class TaskTableDataProvider {
$image = id(new PHUIIconView())
->addSigil($sigil)
->setMetadata($meta)
- ->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-wrench', 'green')
->setText('Blocker');
return $image;
@@ -251,7 +250,6 @@ final class TaskTableDataProvider {
private function getIconforBlocked() {
$image = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-lock', 'red')
->setText('Blocked');
return $image;
--
GitLab