@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
Fix editing Conpherence rooms on mobile
Summary:
rPd6bce34a5db1a838a988440f09f7728747c9e067 failed to replace all occurrences of `$this->getApplicationURI('update/'.$conpherence->getID().'/')` with `$this->getApplicationURI('edit/'.$conpherence->getID().'/')`. Thus editing a Conpherence room on mobile crashes due to using an old invalid path.
Closes T15513
Test Plan:
* Run `grep -r "update/" . | grep onpherenc` vs `grep -r "edit/" . | grep onpherenc` and read rPd6bce34a5db1a838a988440f09f7728747c9e067
* Go to a Conpherence room in mobile view and select "Edit Room"
* Go to a Conpherence room in desktop view and select "Edit Room"
Reviewers: O1 Blessed Committers, valerio.bozzolan
Reviewed By: O1 Blessed Committers, valerio.bozzolan
Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno
Maniphest Tasks: T15513
Differential Revision: https://we.phorge.it/D25879
+24
-24
+14
-14
resources/celerity/map.php
+14
-14
resources/celerity/map.php
···
10
10
'conpherence.pkg.css' => '2f25eb4f',
11
11
'conpherence.pkg.js' => '020aebcf',
12
12
'core.pkg.css' => '112931ab',
13
-
'core.pkg.js' => '820af51e',
13
+
'core.pkg.js' => 'd9e681ec',
14
14
'dark-console.pkg.js' => '187792c2',
15
15
'differential.pkg.css' => '94bb10ca',
16
16
'differential.pkg.js' => '46fcb3af',
···
365
365
'rsrc/js/application/calendar/behavior-event-all-day.js' => '0b1bc990',
366
366
'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0',
367
367
'rsrc/js/application/config/behavior-reorder-fields.js' => '2539f834',
368
-
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'aec8e38c',
368
+
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'b314366e',
369
369
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '91befbcc',
370
370
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2',
371
371
'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf',
···
556
556
'conpherence-message-pane-css' => '50b1345e',
557
557
'conpherence-notification-css' => '85c48def',
558
558
'conpherence-participant-pane-css' => '69e0058a',
559
-
'conpherence-thread-manager' => 'aec8e38c',
559
+
'conpherence-thread-manager' => 'b314366e',
560
560
'conpherence-transaction-css' => '3a3f5e7e',
561
561
'd3' => 'e97b4b78',
562
562
'diff-tree-view-css' => 'e2d3e222',
···
1893
1893
'javelin-typeahead-ondemand-source',
1894
1894
'javelin-util',
1895
1895
),
1896
-
'aec8e38c' => array(
1897
-
'javelin-dom',
1898
-
'javelin-util',
1899
-
'javelin-stratcom',
1900
-
'javelin-install',
1901
-
'javelin-aphlict',
1902
-
'javelin-workflow',
1903
-
'javelin-router',
1904
-
'javelin-behavior-device',
1905
-
'javelin-vector',
1906
-
),
1907
1896
'b105a3a6' => array(
1908
1897
'javelin-behavior',
1909
1898
'javelin-stratcom',
···
1913
1902
'javelin-behavior',
1914
1903
'javelin-stratcom',
1915
1904
'javelin-dom',
1905
+
),
1906
+
'b314366e' => array(
1907
+
'javelin-dom',
1908
+
'javelin-util',
1909
+
'javelin-stratcom',
1910
+
'javelin-install',
1911
+
'javelin-aphlict',
1912
+
'javelin-workflow',
1913
+
'javelin-router',
1914
+
'javelin-behavior-device',
1915
+
'javelin-vector',
1916
1916
),
1917
1917
'b347a301' => array(
1918
1918
'javelin-behavior',
+1
-1
src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+1
-1
src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+2
-2
src/applications/conpherence/controller/ConpherenceController.php
+2
-2
src/applications/conpherence/controller/ConpherenceController.php
···
29
29
->setName(pht('Edit Room'))
30
30
->setType(PHUIListItemView::TYPE_LINK)
31
31
->setHref(
32
-
$this->getApplicationURI('update/'.$conpherence->getID()).'/')
32
+
$this->getApplicationURI('edit/'.$conpherence->getID()).'/')
33
33
->setWorkflow(true));
34
34
35
35
$nav->addMenuItem(
···
135
135
136
136
if (!$participating) {
137
137
$action = ConpherenceUpdateActions::JOIN_ROOM;
138
-
$uri = $this->getApplicationURI("update/{$id}/");
138
+
$uri = $this->getApplicationURI("edit/{$id}/");
139
139
$button = phutil_tag(
140
140
'button',
141
141
array(
+1
-1
src/applications/conpherence/controller/ConpherenceParticipantController.php
+1
-1
src/applications/conpherence/controller/ConpherenceParticipantController.php
···
24
24
return new Aphront404Response();
25
25
}
26
26
27
-
$uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
27
+
$uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
28
28
$content = id(new ConpherenceParticipantView())
29
29
->setUser($this->getViewer())
30
30
->setConpherence($conpherence)
+2
-2
src/applications/conpherence/controller/ConpherenceUpdateController.php
+2
-2
src/applications/conpherence/controller/ConpherenceUpdateController.php
···
204
204
$dialog
205
205
->setUser($user)
206
206
->setWidth(AphrontDialogView::WIDTH_FORM)
207
-
->setSubmitURI($this->getApplicationURI('update/'.$conpherence_id.'/'))
207
+
->setSubmitURI($this->getApplicationURI('edit/'.$conpherence_id.'/'))
208
208
->addSubmitButton()
209
209
->addCancelButton($this->getApplicationURI($conpherence->getID().'/'));
210
210
···
373
373
$rendered_transactions = idx($data, 'transactions');
374
374
$new_latest_transaction_id = idx($data, 'latest_transaction_id');
375
375
376
-
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
376
+
$update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
377
377
$nav_item = null;
378
378
$header = null;
379
379
$people_widget = null;
+1
-1
src/applications/conpherence/controller/ConpherenceViewController.php
+1
-1
src/applications/conpherence/controller/ConpherenceViewController.php
···
147
147
$draft = PhabricatorDraft::newFromUserAndKey(
148
148
$user,
149
149
$conpherence->getPHID());
150
-
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
150
+
$update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
151
151
152
152
if ($user->isLoggedIn()) {
153
153
$this->initBehavior('conpherence-pontificate');
+2
-2
src/applications/conpherence/view/ConpherenceDurableColumnView.php
+2
-2
src/applications/conpherence/view/ConpherenceDurableColumnView.php
···
356
356
$actions[] = array(
357
357
'name' => pht('Add Participants'),
358
358
'disabled' => !$can_edit,
359
-
'href' => '/conpherence/update/'.$conpherence->getID().'/',
359
+
'href' => '/conpherence/edit/'.$conpherence->getID().'/',
360
360
'icon' => 'fa-plus',
361
361
'key' => ConpherenceUpdateActions::ADD_PERSON,
362
362
);
···
457
457
$this->getUser(),
458
458
array(
459
459
'method' => 'POST',
460
-
'action' => '/conpherence/update/'.$id.'/',
460
+
'action' => '/conpherence/edit/'.$id.'/',
461
461
'sigil' => 'conpherence-message-form',
462
462
),
463
463
array(
+1
-1
webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
+1
-1
webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js