Page MenuHomePhabricator
Files F15282794

D14595.diff
No OneTemporary
Actions

D14595.diff
View Options

diff --git a/src/applications/pholio/controller/PholioController.php b/src/applications/pholio/controller/PholioController.php
--- a/src/applications/pholio/controller/PholioController.php
+++ b/src/applications/pholio/controller/PholioController.php
@@ -2,23 +2,9 @@
abstract class PholioController extends PhabricatorController {
- public function buildSideNavView($for_app = false) {
- $user = $this->getRequest()->getUser();
-
- $nav = new AphrontSideNavFilterView();
- $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
-
- id(new PholioMockSearchEngine())
- ->setViewer($user)
- ->addNavigationItems($nav->getMenu());
-
- if ($for_app) {
- $nav->addFilter('new/', pht('Create Mock'));
- }
-
- $nav->selectFilter(null);
-
- return $nav;
+ public function buildApplicationMenu() {
+ return $this->newApplicationMenu()
+ ->setSearchEngine(new PholioMockSearchEngine());
}
protected function buildApplicationCrumbs() {
@@ -33,8 +19,4 @@
return $crumbs;
}
- public function buildApplicationMenu() {
- return $this->buildSideNavView(true)->getMenu();
- }
-
}
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -384,10 +384,13 @@
$this->addExtraQuicksandConfig(
array('mockEditConfig' => true));
- return $this->buildApplicationPage(
- $content,
- array(
- 'title' => $title,
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild(
+ array(
+ $form_box,
));
}
diff --git a/src/applications/pholio/controller/PholioMockListController.php b/src/applications/pholio/controller/PholioMockListController.php
--- a/src/applications/pholio/controller/PholioMockListController.php
+++ b/src/applications/pholio/controller/PholioMockListController.php
@@ -7,14 +7,9 @@
}
public function handleRequest(AphrontRequest $request) {
- $querykey = $request->getURIData('queryKey');
-
- $controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($querykey)
- ->setSearchEngine(new PholioMockSearchEngine())
- ->setNavigation($this->buildSideNavView());
-
- return $this->delegateToController($controller);
+ return id(new PholioMockSearchEngine())
+ ->setController($this)
+ ->buildResponse();
}
}
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -98,20 +98,17 @@
->setUser($viewer)
->setMock($mock);
- $content = array(
- $crumbs,
- $object_box,
- $output,
- $thumb_grid,
- $timeline,
- $add_comment,
- );
-
- return $this->buildApplicationPage(
- $content,
- array(
- 'title' => 'M'.$mock->getID().' '.$title,
- 'pageObjects' => array($mock->getPHID()),
+ return $this->newPage()
+ ->setTitle('M'.$mock->getID().' '.$title)
+ ->setCrumbs($crumbs)
+ ->setPageObjectPHIDs(array($mock->getPHID()))
+ ->appendChild(
+ array(
+ $object_box,
+ $output,
+ $thumb_grid,
+ $timeline,
+ $add_comment,
));
}

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 2:28 AM (1 w, 6 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223368
Default Alt Text
D14595.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility