@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 Drydock Lease STATUS_EXPIRED to STATUS_DESTROYED
Summary: Ref T9252. This is now more consistent (same as the equivalent Resource state) and accurate (leases can end up in this state a bunch of ways, including by expiring).
Test Plan: `grep`, browsed around web UI.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T9252
Differential Revision: https://secure.phabricator.com/D14150
+18
-40
+13
-13
src/applications/drydock/constants/DrydockLeaseStatus.php
+13
-13
src/applications/drydock/constants/DrydockLeaseStatus.php
···
2
2
3
3
final class DrydockLeaseStatus extends DrydockConstants {
4
4
5
-
const STATUS_PENDING = 0;
6
-
const STATUS_ACQUIRED = 5;
7
-
const STATUS_ACTIVE = 1;
8
-
const STATUS_RELEASED = 2;
9
-
const STATUS_BROKEN = 3;
10
-
const STATUS_EXPIRED = 4;
5
+
const STATUS_PENDING = 0;
6
+
const STATUS_ACQUIRED = 5;
7
+
const STATUS_ACTIVE = 1;
8
+
const STATUS_RELEASED = 2;
9
+
const STATUS_BROKEN = 3;
10
+
const STATUS_DESTROYED = 4;
11
11
12
12
public static function getNameForStatus($status) {
13
13
$map = array(
14
-
self::STATUS_PENDING => pht('Pending'),
15
-
self::STATUS_ACQUIRED => pht('Acquired'),
16
-
self::STATUS_ACTIVE => pht('Active'),
17
-
self::STATUS_RELEASED => pht('Released'),
18
-
self::STATUS_BROKEN => pht('Broken'),
19
-
self::STATUS_EXPIRED => pht('Expired'),
14
+
self::STATUS_PENDING => pht('Pending'),
15
+
self::STATUS_ACQUIRED => pht('Acquired'),
16
+
self::STATUS_ACTIVE => pht('Active'),
17
+
self::STATUS_RELEASED => pht('Released'),
18
+
self::STATUS_BROKEN => pht('Broken'),
19
+
self::STATUS_DESTROYED => pht('Destroyed'),
20
20
);
21
21
22
22
return idx($map, $status, pht('Unknown'));
···
29
29
self::STATUS_ACTIVE,
30
30
self::STATUS_RELEASED,
31
31
self::STATUS_BROKEN,
32
-
self::STATUS_EXPIRED,
32
+
self::STATUS_DESTROYED,
33
33
);
34
34
}
35
35
+1
-22
src/applications/drydock/controller/DrydockLeaseViewController.php
+1
-22
src/applications/drydock/controller/DrydockLeaseViewController.php
···
102
102
$view = new PHUIPropertyListView();
103
103
$view->setActionList($actions);
104
104
105
-
switch ($lease->getStatus()) {
106
-
case DrydockLeaseStatus::STATUS_ACTIVE:
107
-
$status = pht('Active');
108
-
break;
109
-
case DrydockLeaseStatus::STATUS_RELEASED:
110
-
$status = pht('Released');
111
-
break;
112
-
case DrydockLeaseStatus::STATUS_EXPIRED:
113
-
$status = pht('Expired');
114
-
break;
115
-
case DrydockLeaseStatus::STATUS_PENDING:
116
-
$status = pht('Pending');
117
-
break;
118
-
case DrydockLeaseStatus::STATUS_BROKEN:
119
-
$status = pht('Broken');
120
-
break;
121
-
default:
122
-
$status = pht('Unknown');
123
-
break;
124
-
}
125
-
126
105
$view->addProperty(
127
106
pht('Status'),
128
-
$status);
107
+
DrydockLeaseStatus::getNameForStatus($lease->getStatus()));
129
108
130
109
$view->addProperty(
131
110
pht('Resource Type'),
+3
-2
src/applications/drydock/storage/DrydockLease.php
+3
-2
src/applications/drydock/storage/DrydockLease.php
···
160
160
return;
161
161
case DrydockLeaseStatus::STATUS_RELEASED:
162
162
throw new Exception(pht('Lease has already been released!'));
163
-
case DrydockLeaseStatus::STATUS_EXPIRED:
164
-
throw new Exception(pht('Lease has already expired!'));
163
+
case DrydockLeaseStatus::STATUS_DESTROYED:
164
+
throw new Exception(pht('Lease has already been destroyed!'));
165
165
case DrydockLeaseStatus::STATUS_BROKEN:
166
166
throw new Exception(pht('Lease has been broken!'));
167
167
case DrydockLeaseStatus::STATUS_PENDING:
···
289
289
290
290
switch ($this->getStatus()) {
291
291
case DrydockLeaseStatus::STATUS_RELEASED:
292
+
case DrydockLeaseStatus::STATUS_DESTROYED:
292
293
return false;
293
294
default:
294
295
return true;
+1
-3
src/applications/drydock/worker/DrydockLeaseDestroyWorker.php
+1
-3
src/applications/drydock/worker/DrydockLeaseDestroyWorker.php