@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
Rename "status" to "event" in most URIs / classes / etc
Summary: Ref T4375. This doesn't get everything (I figure I'll clean up the actual UI strings when I touch the UIs) but should get the bulk of the URIs and class names and stuff.
Test Plan: Clicked every calendar-related link I could find/grep, they all still seem to work. URIs now say "event".
Reviewers: btrahan, chad
Reviewed By: btrahan
CC: aran
Maniphest Tasks: T4375
Differential Revision: https://secure.phabricator.com/D8147
+32
-38
+6
-6
src/__phutil_library_map__.php
+6
-6
src/__phutil_library_map__.php
···
1260
1260
'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
1261
1261
'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
1262
1262
'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
1263
-
'PhabricatorCalendarDeleteStatusController' => 'applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php',
1264
-
'PhabricatorCalendarEditStatusController' => 'applications/calendar/controller/PhabricatorCalendarEditStatusController.php',
1265
1263
'PhabricatorCalendarEvent' => 'applications/calendar/storage/PhabricatorCalendarEvent.php',
1264
+
'PhabricatorCalendarEventDeleteController' => 'applications/calendar/controller/PhabricatorCalendarEventDeleteController.php',
1265
+
'PhabricatorCalendarEventEditController' => 'applications/calendar/controller/PhabricatorCalendarEventEditController.php',
1266
1266
'PhabricatorCalendarEventInvalidEpochException' => 'applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php',
1267
+
'PhabricatorCalendarEventListController' => 'applications/calendar/controller/PhabricatorCalendarEventListController.php',
1267
1268
'PhabricatorCalendarEventOverlapException' => 'applications/calendar/exception/PhabricatorCalendarEventOverlapException.php',
1268
1269
'PhabricatorCalendarEventQuery' => 'applications/calendar/query/PhabricatorCalendarEventQuery.php',
1269
1270
'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
1270
1271
'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
1271
-
'PhabricatorCalendarViewStatusController' => 'applications/calendar/controller/PhabricatorCalendarViewStatusController.php',
1272
1272
'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php',
1273
1273
'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
1274
1274
'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
···
3899
3899
'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
3900
3900
'PhabricatorCalendarController' => 'PhabricatorController',
3901
3901
'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
3902
-
'PhabricatorCalendarDeleteStatusController' => 'PhabricatorCalendarController',
3903
-
'PhabricatorCalendarEditStatusController' => 'PhabricatorCalendarController',
3904
3902
'PhabricatorCalendarEvent' =>
3905
3903
array(
3906
3904
0 => 'PhabricatorCalendarDAO',
3907
3905
1 => 'PhabricatorPolicyInterface',
3908
3906
),
3907
+
'PhabricatorCalendarEventDeleteController' => 'PhabricatorCalendarController',
3908
+
'PhabricatorCalendarEventEditController' => 'PhabricatorCalendarController',
3909
3909
'PhabricatorCalendarEventInvalidEpochException' => 'Exception',
3910
+
'PhabricatorCalendarEventListController' => 'PhabricatorCalendarController',
3910
3911
'PhabricatorCalendarEventOverlapException' => 'Exception',
3911
3912
'PhabricatorCalendarEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
3912
3913
'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
3913
3914
'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
3914
-
'PhabricatorCalendarViewStatusController' => 'PhabricatorCalendarController',
3915
3915
'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter',
3916
3916
'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
3917
3917
'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
+7
-9
src/applications/calendar/application/PhabricatorApplicationCalendar.php
+7
-9
src/applications/calendar/application/PhabricatorApplicationCalendar.php
···
36
36
return array(
37
37
'/calendar/' => array(
38
38
'' => 'PhabricatorCalendarBrowseController',
39
-
'status/' => array(
40
-
'' => 'PhabricatorCalendarViewStatusController',
39
+
'event/' => array(
40
+
'' => 'PhabricatorCalendarEventListController',
41
41
'create/' =>
42
-
'PhabricatorCalendarEditStatusController',
43
-
'delete/(?P<id>[1-9]\d*)/' =>
44
-
'PhabricatorCalendarDeleteStatusController',
42
+
'PhabricatorCalendarEventEditController',
45
43
'edit/(?P<id>[1-9]\d*)/' =>
46
-
'PhabricatorCalendarEditStatusController',
47
-
'view/(?P<phid>[^/]+)/' =>
48
-
'PhabricatorCalendarViewStatusController',
44
+
'PhabricatorCalendarEventEditController',
45
+
'delete/(?P<id>[1-9]\d*)/' =>
46
+
'PhabricatorCalendarEventDeleteController',
49
47
),
50
48
),
51
49
);
···
57
55
$item = id(new PHUIListItemView())
58
56
->setName(pht('Calendar Event'))
59
57
->setAppIcon('calendar-dark')
60
-
->setHref($this->getBaseURI().'status/create/');
58
+
->setHref($this->getBaseURI().'event/create/');
61
59
$items[] = $item;
62
60
63
61
return $items;
+3
-3
src/applications/calendar/controller/PhabricatorCalendarController.php
+3
-3
src/applications/calendar/controller/PhabricatorCalendarController.php
···
9
9
10
10
$nav->addLabel(pht('Calendar'));
11
11
$nav->addFilter('/', pht('View All'));
12
-
$nav->addFilter('status/create/', pht('New Status'));
12
+
$nav->addFilter('event/create/', pht('New Status'));
13
13
14
14
if ($status && $status->getID()) {
15
-
$nav->addFilter('status/edit/'.$status->getID().'/', pht('Edit Status'));
15
+
$nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Status'));
16
16
}
17
-
$nav->addFilter('status/', pht('Upcoming Statuses'));
17
+
$nav->addFilter('event/', pht('Upcoming Statuses'));
18
18
19
19
return $nav;
20
20
}
+2
-2
src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventDeleteController.php
+2
-2
src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventDeleteController.php
···
1
1
<?php
2
2
3
-
final class PhabricatorCalendarDeleteStatusController
3
+
final class PhabricatorCalendarEventDeleteController
4
4
extends PhabricatorCalendarController {
5
5
6
6
private $id;
···
45
45
pht('Permanently delete this status? This action can not be undone.'));
46
46
$dialog->addSubmitButton(pht('Delete'));
47
47
$dialog->addCancelButton(
48
-
$this->getApplicationURI('status/edit/'.$status->getID().'/'));
48
+
$this->getApplicationURI('event/'));
49
49
50
50
return id(new AphrontDialogResponse())->setDialog($dialog);
51
51
+8
-8
src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+8
-8
src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
···
1
1
<?php
2
2
3
-
final class PhabricatorCalendarEditStatusController
3
+
final class PhabricatorCalendarEventEditController
4
4
extends PhabricatorCalendarController {
5
5
6
6
private $id;
···
35
35
$start_value = $start_time->readValueFromRequest($request);
36
36
$submit_label = pht('Create');
37
37
$filter = 'status/create/';
38
-
$page_title = pht('Create Status');
38
+
$page_title = pht('Create Event');
39
39
$redirect = 'created';
40
40
} else {
41
41
$status = id(new PhabricatorCalendarEventQuery())
···
51
51
$end_time->setValue($status->getDateTo());
52
52
$start_time->setValue($status->getDateFrom());
53
53
$submit_label = pht('Update');
54
-
$filter = 'status/edit/'.$status->getID().'/';
55
-
$page_title = pht('Update Status');
54
+
$filter = 'event/edit/'.$status->getID().'/';
55
+
$page_title = pht('Update Event');
56
56
$redirect = 'updated';
57
57
}
58
58
···
125
125
->setTitle($page_title)
126
126
->setWidth(AphrontDialogView::WIDTH_FORM);
127
127
if ($this->isCreate()) {
128
-
$dialog->setSubmitURI($this->getApplicationURI('status/create/'));
128
+
$dialog->setSubmitURI($this->getApplicationURI('event/create/'));
129
129
} else {
130
130
$dialog->setSubmitURI(
131
-
$this->getApplicationURI('status/edit/'.$status->getID().'/'));
131
+
$this->getApplicationURI('event/edit/'.$status->getID().'/'));
132
132
}
133
133
$form = new PHUIFormLayoutView();
134
134
if ($error_view) {
···
156
156
$submit->addCancelButton($this->getApplicationURI());
157
157
} else {
158
158
$submit->addCancelButton(
159
-
$this->getApplicationURI('status/delete/'.$status->getID().'/'),
160
-
pht('Delete Status'));
159
+
$this->getApplicationURI('event/delete/'.$status->getID().'/'),
160
+
pht('Delete Event'));
161
161
}
162
162
163
163
if ($request->isAjax()) {
+3
-7
src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventListController.php
+3
-7
src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
src/applications/calendar/controller/PhabricatorCalendarEventListController.php
···
1
1
<?php
2
2
3
-
final class PhabricatorCalendarViewStatusController
3
+
final class PhabricatorCalendarEventListController
4
4
extends PhabricatorCalendarController {
5
5
6
6
private $phid;
···
52
52
$list = new PHUIObjectItemListView();
53
53
foreach ($statuses as $status) {
54
54
if ($status->getUserPHID() == $user->getPHID()) {
55
-
$href = $this->getApplicationURI('/status/edit/'.$status->getID().'/');
55
+
$href = $this->getApplicationURI('/event/edit/'.$status->getID().'/');
56
56
} else {
57
57
$from = $status->getDateFrom();
58
58
$month = phabricator_format_local_time($from, $user, 'm');
···
99
99
}
100
100
101
101
private function getFilter() {
102
-
if ($this->isUserRequest()) {
103
-
$filter = 'status/';
104
-
} else {
105
-
$filter = 'status/view/'.$this->phid.'/';
106
-
}
102
+
$filter = 'event/';
107
103
108
104
return $filter;
109
105
}
+1
-1
src/applications/calendar/view/AphrontCalendarMonthView.php
+1
-1
src/applications/calendar/view/AphrontCalendarMonthView.php
+1
-1
src/applications/conpherence/controller/ConpherenceController.php
+1
-1
src/applications/conpherence/controller/ConpherenceController.php
···
25
25
id(new PHUIListItemView())
26
26
->setName(pht('New Calendar Item'))
27
27
->setType(PHUIListItemView::TYPE_LINK)
28
-
->setHref('/calendar/status/create/')
28
+
->setHref('/calendar/event/create/')
29
29
->addSigil('conpherence-widget-adder')
30
30
->setMetadata(array('widget' => 'widgets-calendar')));
31
31
+1
-1
src/applications/conpherence/view/ConpherenceLayoutView.php
+1
-1
src/applications/conpherence/view/ConpherenceLayoutView.php