@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
Update Search for handleRequest
Summary: Ref T8628. Updates Search.
Test Plan: Did various searches, saved new queries, reordered, ran new queries.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D14268
+30
-60
+4
-11
src/applications/search/controller/PhabricatorSearchController.php
+4
-11
src/applications/search/controller/PhabricatorSearchController.php
···
5
5
6
6
const SCOPE_CURRENT_APPLICATION = 'application';
7
7
8
-
private $queryKey;
9
-
10
8
public function shouldAllowPublic() {
11
9
return true;
12
10
}
13
11
14
-
public function willProcessRequest(array $data) {
15
-
$this->queryKey = idx($data, 'queryKey');
16
-
}
17
-
18
-
public function processRequest() {
19
-
$request = $this->getRequest();
20
-
$viewer = $request->getUser();
12
+
public function handleRequest(AphrontRequest $request) {
13
+
$viewer = $this->getViewer();
21
14
22
15
if ($request->getStr('jump') != 'no') {
23
16
$pref_jump = PhabricatorUserPreferences::PREFERENCE_SEARCHBAR_JUMP;
···
97
90
}
98
91
99
92
$controller = id(new PhabricatorApplicationSearchController())
100
-
->setQueryKey($this->queryKey)
93
+
->setQueryKey($request->getURIData('queryKey'))
101
94
->setSearchEngine($engine)
102
95
->setNavigation($this->buildSideNavView());
103
96
···
105
98
}
106
99
107
100
public function buildSideNavView($for_app = false) {
108
-
$viewer = $this->getRequest()->getUser();
101
+
$viewer = $this->getViewer();
109
102
110
103
$nav = new AphrontSideNavFilterView();
111
104
$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
+11
-20
src/applications/search/controller/PhabricatorSearchDeleteController.php
+11
-20
src/applications/search/controller/PhabricatorSearchDeleteController.php
···
3
3
final class PhabricatorSearchDeleteController
4
4
extends PhabricatorSearchBaseController {
5
5
6
-
private $queryKey;
7
-
private $engineClass;
8
-
9
-
public function willProcessRequest(array $data) {
10
-
$this->queryKey = idx($data, 'queryKey');
11
-
$this->engineClass = idx($data, 'engine');
12
-
}
13
-
14
-
public function processRequest() {
15
-
$request = $this->getRequest();
16
-
$user = $request->getUser();
17
-
18
-
$key = $this->queryKey;
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
8
+
$key = $request->getURIData('queryKey');
9
+
$engine_class = $request->getURIData('engine');
19
10
20
11
$base_class = 'PhabricatorApplicationSearchEngine';
21
-
if (!is_subclass_of($this->engineClass, $base_class)) {
12
+
if (!is_subclass_of($engine_class, $base_class)) {
22
13
return new Aphront400Response();
23
14
}
24
15
25
-
$engine = newv($this->engineClass, array());
26
-
$engine->setViewer($user);
16
+
$engine = newv($engine_class, array());
17
+
$engine->setViewer($viewer);
27
18
28
19
$named_query = id(new PhabricatorNamedQueryQuery())
29
-
->setViewer($user)
30
-
->withEngineClassNames(array($this->engineClass))
20
+
->setViewer($viewer)
21
+
->withEngineClassNames(array($engine_class))
31
22
->withQueryKeys(array($key))
32
-
->withUserPHIDs(array($user->getPHID()))
23
+
->withUserPHIDs(array($viewer->getPHID()))
33
24
->executeOne();
34
25
35
26
if (!$named_query && $engine->isBuiltinQuery($key)) {
···
84
75
}
85
76
86
77
$dialog = id(new AphrontDialogView())
87
-
->setUser($user)
78
+
->setUser($viewer)
88
79
->setTitle($title)
89
80
->appendChild($desc)
90
81
->addCancelButton($return_uri)
+9
-16
src/applications/search/controller/PhabricatorSearchEditController.php
+9
-16
src/applications/search/controller/PhabricatorSearchEditController.php
···
3
3
final class PhabricatorSearchEditController
4
4
extends PhabricatorSearchBaseController {
5
5
6
-
private $queryKey;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->queryKey = idx($data, 'queryKey');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$user = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
15
8
16
9
$saved_query = id(new PhabricatorSavedQueryQuery())
17
-
->setViewer($user)
18
-
->withQueryKeys(array($this->queryKey))
10
+
->setViewer($viewer)
11
+
->withQueryKeys(array($request->getURIData('queryKey')))
19
12
->executeOne();
20
13
21
14
if (!$saved_query) {
22
15
return new Aphront404Response();
23
16
}
24
17
25
-
$engine = $saved_query->newEngine()->setViewer($user);
18
+
$engine = $saved_query->newEngine()->setViewer($viewer);
26
19
27
20
$complete_uri = $engine->getQueryManagementURI();
28
21
$cancel_uri = $complete_uri;
29
22
30
23
$named_query = id(new PhabricatorNamedQueryQuery())
31
-
->setViewer($user)
24
+
->setViewer($viewer)
32
25
->withQueryKeys(array($saved_query->getQueryKey()))
33
-
->withUserPHIDs(array($user->getPHID()))
26
+
->withUserPHIDs(array($viewer->getPHID()))
34
27
->executeOne();
35
28
if (!$named_query) {
36
29
$named_query = id(new PhabricatorNamedQuery())
37
-
->setUserPHID($user->getPHID())
30
+
->setUserPHID($viewer->getPHID())
38
31
->setQueryKey($saved_query->getQueryKey())
39
32
->setEngineClassName($saved_query->getEngineClassName());
40
33
···
64
57
}
65
58
66
59
$form = id(new AphrontFormView())
67
-
->setUser($user);
60
+
->setUser($viewer);
68
61
69
62
$form->appendChild(
70
63
id(new AphrontFormTextControl())
-1
src/applications/search/controller/PhabricatorSearchHovercardController.php
-1
src/applications/search/controller/PhabricatorSearchHovercardController.php
+6
-12
src/applications/search/controller/PhabricatorSearchOrderController.php
+6
-12
src/applications/search/controller/PhabricatorSearchOrderController.php
···
3
3
final class PhabricatorSearchOrderController
4
4
extends PhabricatorSearchBaseController {
5
5
6
-
private $engineClass;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->engineClass = idx($data, 'engine');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$user = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
8
+
$engine_class = $request->getURIData('engine');
15
9
16
10
$request->validateCSRF();
17
11
18
12
$base_class = 'PhabricatorApplicationSearchEngine';
19
-
if (!is_subclass_of($this->engineClass, $base_class)) {
13
+
if (!is_subclass_of($engine_class, $base_class)) {
20
14
return new Aphront400Response();
21
15
}
22
16
23
-
$engine = newv($this->engineClass, array());
24
-
$engine->setViewer($user);
17
+
$engine = newv($engine_class, array());
18
+
$engine->setViewer($viewer);
25
19
26
20
$queries = $engine->loadAllNamedQueries();
27
21
$queries = mpull($queries, null, 'getQueryKey');