Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc Bug: T124385 ......................................................................
updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc Bug: T124385 Change-Id: I939544e0795da6c8f1db530e783f211591c948ac --- M src/engine/SprintProjectProfilePanelEngine.php M src/storage/SprintListDataProvider.php M src/storage/TaskTableDataProvider.php 3 files changed, 10 insertions(+), 27 deletions(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved jenkins-bot: Verified 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 @@ $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 @@ 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 @@ $image = id(new PHUIIconView()) ->addSigil($sigil) ->setMetadata($meta) - ->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS) ->setIconFont('fa-wrench', 'green') ->setText('Blocker'); return $image; @@ -251,7 +250,6 @@ private function getIconforBlocked() { $image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS) ->setIconFont('fa-lock', 'red') ->setText('Blocked'); return $image; -- To view, visit https://gerrit.wikimedia.org/r/266617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I939544e0795da6c8f1db530e783f211591c948ac Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de> Gerrit-Reviewer: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits