@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Make query results page slightly more generic
Summary: Ref T2625. We currently hard-code the URI; instead, derive it from the Engine. I weakened the strength of getQueryResultsPageURI to let it build from a NamedQuery or a SavedQuery, because constructing a SavedQuery for a builtin NamedQuery is a bit of a pain.
Test Plan: Clicked links on the saved queries page, got query results.
Reviewers: btrahan, blc
Reviewed By: btrahan
CC: aran
Maniphest Tasks: T2625
Differential Revision: https://secure.phabricator.com/D6060
+9
-8
+1
-1
src/applications/paste/controller/PhabricatorPasteListController.php
+1
-1
src/applications/paste/controller/PhabricatorPasteListController.php
···
22
22
if ($request->isFormPost()) {
23
23
return id(new AphrontRedirectResponse())->setURI(
24
24
$engine->getQueryResultsPageURI(
25
-
$engine->buildSavedQueryFromRequest($request)));
25
+
$engine->buildSavedQueryFromRequest($request)->getQueryKey()));
26
26
}
27
27
28
28
$nav = $this->buildSideNavView();
+1
-1
src/applications/paste/controller/PhabricatorPasteQueriesController.php
+1
-1
src/applications/paste/controller/PhabricatorPasteQueriesController.php
···
31
31
32
32
$item = id(new PhabricatorObjectItemView())
33
33
->setHeader($named_query->getQueryName())
34
-
->setHref('/paste/query/'.$named_query->getQueryKey().'/');
34
+
->setHref($engine->getQueryResultsPageURI($named_query->getQueryKey()));
35
35
36
36
if ($named_query->getIsBuiltin()) {
37
37
$item->addIcon('lock-grey', pht('Builtin'));
+2
-2
src/applications/paste/query/PhabricatorPasteSearchEngine.php
+2
-2
src/applications/paste/query/PhabricatorPasteSearchEngine.php
···
80
80
return $form;
81
81
}
82
82
83
-
public function getQueryResultsPageURI(PhabricatorSavedQuery $query) {
84
-
return '/paste/query/'.$query->getQueryKey().'/';
83
+
public function getQueryResultsPageURI($query_key) {
84
+
return '/paste/query/'.$query_key.'/';
85
85
}
86
86
87
87
public function getQueryManagementURI() {
+2
-1
src/applications/search/controller/PhabricatorSearchEditController.php
+2
-1
src/applications/search/controller/PhabricatorSearchEditController.php
···
44
44
// If we haven't saved the query yet, this is a "Save..." operation, so
45
45
// take the user back to the query if they cancel instead of back to the
46
46
// management interface.
47
-
$cancel_uri = $engine->getQueryResultsPageURI($saved_query);
47
+
$cancel_uri = $engine->getQueryResultsPageURI(
48
+
$saved_query->getQueryKey());
48
49
}
49
50
50
51
$e_name = true;
+3
-3
src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+3
-3
src/applications/search/engine/PhabricatorApplicationSearchEngine.php
···
56
56
* Return an application URI corresponding to the results page of a query.
57
57
* Normally, this is something like `/application/query/QUERYKEY/`.
58
58
*
59
-
* @param PhabricatorSavedQuery The query to build a URI for.
60
-
* @return string URI where the query can be executed.
59
+
* @param string The query key to build a URI for.
60
+
* @return string URI where the query can be executed.
61
61
* @task uri
62
62
*/
63
-
abstract public function getQueryResultsPageURI(PhabricatorSavedQuery $query);
63
+
abstract public function getQueryResultsPageURI($query_key);
64
64
65
65
66
66
/**