diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php index 7467a5eee7..370cf442bf 100644 --- a/src/applications/home/controller/PhabricatorHomeMainController.php +++ b/src/applications/home/controller/PhabricatorHomeMainController.php @@ -33,6 +33,10 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { ->setViewer($user) ->setDashboard($dashboard) ->renderDashboard(); + if (PhabricatorEnv::getEnvConfig('welcome.file') !== null) { + $content = array($this->buildWelcomePanelFromFile(), + $content); + } } else { $project_query = new PhabricatorProjectQuery(); $project_query->setViewer($user); @@ -108,8 +112,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { $revision_panel = null; } - $feed_panel = $this->buildFeedPanel(); - require_celerity_resource('homepage-panel-css'); $home = phutil_tag( 'div', @@ -125,7 +127,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { $audit_panel, $commit_panel, $this->minipanels, - $feed_panel, )); return $home; } @@ -138,10 +139,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { } $user = $this->getRequest()->getUser(); - if (!$user->isLoggedIn()) { - return null; - } - $task_query = id(new ManiphestTaskQuery()) ->setViewer($user) @@ -220,10 +217,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { private function buildRevisionPanel() { $user = $this->getRequest()->getUser(); - if (!$user->isLoggedIn()) { - return null; - } - $user_phid = $user->getPHID(); $revision_query = id(new DifferentialRevisionQuery()) @@ -295,10 +288,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { private function buildTasksPanel() { $user = $this->getRequest()->getUser(); - if (!$user->isLoggedIn()) { - return null; - } - $user_phid = $user->getPHID(); $task_query = id(new ManiphestTaskQuery()) @@ -332,7 +321,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { $user = $this->getRequest()->getUser(); $phids = array_merge( - array_filter(mpull($tasks, 'getAuthorPHID')), array_filter(mpull($tasks, 'getOwnerPHID')), array_mergev(mpull($tasks, 'getProjectPHIDs'))); @@ -359,8 +347,8 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { } private function renderMiniPanel($title, $body) { - $panel = new PHUIErrorView(); - $panel->setSeverity(PHUIErrorView::SEVERITY_NODATA); + $panel = new PHUIInfoView(); + $panel->setSeverity(PHUIInfoView::SEVERITY_NODATA); $panel->appendChild( phutil_tag( 'p', @@ -376,9 +364,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { public function buildAuditPanel() { $request = $this->getRequest(); $user = $request->getUser(); - if (!$user->isLoggedIn()) { - return null; - } $phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user); @@ -419,9 +404,6 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { public function buildCommitPanel() { $request = $this->getRequest(); $user = $request->getUser(); - if (!$user->isLoggedIn()) { - return null; - } $phids = array($user->getPHID()); @@ -458,31 +440,4 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { return $panel; } - public function buildFeedPanel() { - $request = $this->getRequest(); - $user = $request->getUser(); - if ($user->isLoggedIn()) { - return null; - } - - $viewer = PhabricatorUser::getOmnipotentUser(); - - $query = new PhabricatorFeedQuery(); - $query->setViewer($viewer); - $query->setLimit(25); - $stories = $query->execute(); - - $builder = new PhabricatorFeedBuilder($stories); - $builder - ->setFramed(true) - ->setUser($viewer); - - $panel = new AphrontPanelView(); - $panel->setHeader('Activity Feed'); - $panel->setNoBackground(); - $panel->appendChild($builder->buildView()); - - return $panel; - } - }