@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 Phlux for handleRequest
Summary: Ref T8628. Updates Phlux
Test Plan: New var, list vars, edit vars
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D14267
+24
-37
+11
-17
src/applications/phlux/controller/PhluxEditController.php
+11
-17
src/applications/phlux/controller/PhluxEditController.php
···
2
2
3
3
final class PhluxEditController extends PhluxController {
4
4
5
-
private $key;
6
-
7
-
public function willProcessRequest(array $data) {
8
-
$this->key = idx($data, 'key');
9
-
}
10
-
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $this->getViewer();
7
+
$key = $request->getURIData('key');
14
8
15
-
$is_new = ($this->key === null);
9
+
$is_new = ($key === null);
16
10
if ($is_new) {
17
11
$var = new PhluxVariable();
18
12
$var->setViewPolicy(PhabricatorPolicies::POLICY_USER);
19
13
$var->setEditPolicy(PhabricatorPolicies::POLICY_USER);
20
14
} else {
21
15
$var = id(new PhluxVariableQuery())
22
-
->setViewer($user)
16
+
->setViewer($viewer)
23
17
->requireCapabilities(
24
18
array(
25
19
PhabricatorPolicyCapability::CAN_VIEW,
26
20
PhabricatorPolicyCapability::CAN_EDIT,
27
21
))
28
-
->withKeys(array($this->key))
22
+
->withKeys(array($key))
29
23
->executeOne();
30
24
if (!$var) {
31
25
return new Aphront404Response();
32
26
}
33
-
$view_uri = $this->getApplicationURI('/view/'.$this->key.'/');
27
+
$view_uri = $this->getApplicationURI('/view/'.$key.'/');
34
28
}
35
29
36
30
$e_key = ($is_new ? true : null);
···
67
61
68
62
if (!$errors) {
69
63
$editor = id(new PhluxVariableEditor())
70
-
->setActor($user)
64
+
->setActor($viewer)
71
65
->setContinueOnNoEffect(true)
72
66
->setContentSourceFromRequest($request);
73
67
···
110
104
}
111
105
112
106
$policies = id(new PhabricatorPolicyQuery())
113
-
->setViewer($user)
107
+
->setViewer($viewer)
114
108
->setObject($var)
115
109
->execute();
116
110
117
111
$form = id(new AphrontFormView())
118
-
->setUser($user)
112
+
->setUser($viewer)
119
113
->appendChild(
120
114
id(new AphrontFormTextControl())
121
115
->setValue($var->getVariableKey())
···
161
155
$title = pht('Create Variable');
162
156
$crumbs->addTextCrumb($title, $request->getRequestURI());
163
157
} else {
164
-
$title = pht('Edit %s', $this->key);
158
+
$title = pht('Edit %s', $key);
165
159
$crumbs->addTextCrumb($title, $request->getRequestURI());
166
160
}
167
161
+4
-5
src/applications/phlux/controller/PhluxListController.php
+4
-5
src/applications/phlux/controller/PhluxListController.php
···
2
2
3
3
final class PhluxListController extends PhluxController {
4
4
5
-
public function processRequest() {
6
-
$request = $this->getRequest();
7
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $this->getViewer();
8
7
9
8
$pager = new AphrontCursorPagerView();
10
9
$pager->readFromRequest($request);
11
10
$query = id(new PhluxVariableQuery())
12
-
->setViewer($user);
11
+
->setViewer($viewer);
13
12
14
13
$vars = $query->executeWithCursorPager($pager);
15
14
···
22
21
$item->setHref($this->getApplicationURI('/view/'.$key.'/'));
23
22
$item->addIcon(
24
23
'none',
25
-
phabricator_datetime($var->getDateModified(), $user));
24
+
phabricator_datetime($var->getDateModified(), $viewer));
26
25
27
26
$view->addItem($item);
28
27
}
+9
-15
src/applications/phlux/controller/PhluxViewController.php
+9
-15
src/applications/phlux/controller/PhluxViewController.php
···
2
2
3
3
final class PhluxViewController extends PhluxController {
4
4
5
-
private $key;
6
-
7
-
public function willProcessRequest(array $data) {
8
-
$this->key = $data['key'];
9
-
}
10
-
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $this->getViewer();
7
+
$key = $request->getURIData('key');
14
8
15
9
$var = id(new PhluxVariableQuery())
16
-
->setViewer($user)
17
-
->withKeys(array($this->key))
10
+
->setViewer($viewer)
11
+
->withKeys(array($key))
18
12
->executeOne();
19
13
20
14
if (!$var) {
···
29
23
30
24
$header = id(new PHUIHeaderView())
31
25
->setHeader($title)
32
-
->setUser($user)
26
+
->setUser($viewer)
33
27
->setPolicyObject($var);
34
28
35
29
$actions = id(new PhabricatorActionListView())
36
-
->setUser($user)
30
+
->setUser($viewer)
37
31
->setObjectURI($request->getRequestURI())
38
32
->setObject($var);
39
33
40
34
$can_edit = PhabricatorPolicyFilter::hasCapability(
41
-
$user,
35
+
$viewer,
42
36
$var,
43
37
PhabricatorPolicyCapability::CAN_EDIT);
44
38
···
53
47
$display_value = json_encode($var->getVariableValue());
54
48
55
49
$properties = id(new PHUIPropertyListView())
56
-
->setUser($user)
50
+
->setUser($viewer)
57
51
->setObject($var)
58
52
->setActionList($actions)
59
53
->addProperty(pht('Value'), $display_value);