Page MenuHomePhabricator
Files F15400006

D15015.diff
No OneTemporary
Actions

D15015.diff
View Options

diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
--- a/src/applications/diviner/application/PhabricatorDivinerApplication.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -35,7 +35,7 @@
return array(
'/diviner/' => array(
'' => 'DivinerMainController',
- 'query/((?<key>[^/]+)/)?' => 'DivinerAtomListController',
+ 'query/((?<queryKey>[^/]+)/)?' => 'DivinerAtomListController',
'find/' => 'DivinerFindController',
),
'/book/(?P<book>[^/]+)/' => 'DivinerBookController',
diff --git a/src/applications/diviner/controller/DivinerAtomListController.php b/src/applications/diviner/controller/DivinerAtomListController.php
--- a/src/applications/diviner/controller/DivinerAtomListController.php
+++ b/src/applications/diviner/controller/DivinerAtomListController.php
@@ -7,14 +7,9 @@
}
public function handleRequest(AphrontRequest $request) {
- $query_key = $request->getURIData('key');
-
- $controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($query_key)
- ->setSearchEngine(new DivinerAtomSearchEngine())
- ->setNavigation($this->buildSideNavView());
-
- return $this->delegateToController($controller);
+ return id(new DivinerAtomSearchEngine())
+ ->setController($this)
+ ->buildResponse();
}
}
diff --git a/src/applications/diviner/controller/DivinerController.php b/src/applications/diviner/controller/DivinerController.php
--- a/src/applications/diviner/controller/DivinerController.php
+++ b/src/applications/diviner/controller/DivinerController.php
@@ -2,19 +2,9 @@
abstract class DivinerController extends PhabricatorController {
- protected function buildSideNavView() {
- $menu = $this->buildApplicationMenu();
- return AphrontSideNavFilterView::newFromMenu($menu);
- }
-
public function buildApplicationMenu() {
- $menu = new PHUIListView();
-
- id(new DivinerAtomSearchEngine())
- ->setViewer($this->getRequest()->getViewer())
- ->addNavigationItems($menu);
-
- return $menu;
+ return $this->newApplicationMenu()
+ ->setSearchEngine(new DivinerAtomSearchEngine());
}
protected function renderAtomList(array $symbols) {
diff --git a/src/applications/diviner/query/DivinerAtomSearchEngine.php b/src/applications/diviner/query/DivinerAtomSearchEngine.php
--- a/src/applications/diviner/query/DivinerAtomSearchEngine.php
+++ b/src/applications/diviner/query/DivinerAtomSearchEngine.php
@@ -103,7 +103,7 @@
protected function getBuiltinQueryNames() {
return array(
- 'all' => pht('All'),
+ 'all' => pht('All Atoms'),
);
}
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -70,7 +70,7 @@
return array(
'/F(?P<id>[1-9]\d*)' => 'PhabricatorFileInfoController',
'/file/' => array(
- '(query/(?P<key>[^/]+)/)?' => 'PhabricatorFileListController',
+ '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFileListController',
'upload/' => 'PhabricatorFileUploadController',
'dropupload/' => 'PhabricatorFileDropUploadController',
'compose/' => 'PhabricatorFileComposeController',
diff --git a/src/applications/files/controller/PhabricatorFileController.php b/src/applications/files/controller/PhabricatorFileController.php
--- a/src/applications/files/controller/PhabricatorFileController.php
+++ b/src/applications/files/controller/PhabricatorFileController.php
@@ -2,28 +2,9 @@
abstract class PhabricatorFileController extends PhabricatorController {
- protected function buildSideNavView() {
- $menu = $this->buildMenu($for_devices = false);
- return AphrontSideNavFilterView::newFromMenu($menu);
- }
-
public function buildApplicationMenu() {
- return $this->buildMenu($for_devices = true);
- }
-
- private function buildMenu($for_devices) {
- $menu = new PHUIListView();
-
- if ($for_devices) {
- $menu->newLink(pht('Upload File'), $this->getApplicationURI('/upload/'));
- }
-
- id(new PhabricatorFileSearchEngine())
- ->setViewer($this->getRequest()->getUser())
- ->addNavigationItems($menu);
-
- return $menu;
+ return $this->newApplicationMenu()
+ ->setSearchEngine(new PhabricatorFileSearchEngine());
}
-
}
diff --git a/src/applications/files/controller/PhabricatorFileListController.php b/src/applications/files/controller/PhabricatorFileListController.php
--- a/src/applications/files/controller/PhabricatorFileListController.php
+++ b/src/applications/files/controller/PhabricatorFileListController.php
@@ -11,16 +11,14 @@
}
public function handleRequest(AphrontRequest $request) {
- $controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($request->getURIData('key'))
- ->setSearchEngine(new PhabricatorFileSearchEngine())
- ->setNavigation($this->buildSideNavView());
-
- return $this->delegateToController($controller);
+ return id(new PhabricatorFileSearchEngine())
+ ->setController($this)
+ ->buildResponse();
}
protected function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs();
+
$crumbs->addAction(
id(new PHUIListItemView())
->setName(pht('Upload File'))
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -46,13 +46,6 @@
return $this;
}
- public static function newFromMenu(PHUIListView $menu) {
- $object = new AphrontSideNavFilterView();
- $object->setBaseURI(new PhutilURI('/'));
- $object->menu = $menu;
- return $object;
- }
-
public function setCrumbs(PHUICrumbsView $crumbs) {
$this->crumbs = $crumbs;
return $this;

File Metadata

Mime Type
text/plain
Expires
Mar 18 2025, 9:04 AM (4 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7475907
Default Alt Text
D15015.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility