Page MenuHomePhabricator
Files F15439791

D21598.diff
No OneTemporary
Actions

D21598.diff
View Options

diff --git a/resources/sql/autopatches/20210309.auditors.01.status.sql b/resources/sql/autopatches/20210309.auditors.01.status.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20210309.auditors.01.status.sql
@@ -0,0 +1,5 @@
+UPDATE {$NAMESPACE}_repository.repository_auditrequest
+ SET auditStatus = 'accepted' WHERE auditStatus = 'closed';
+
+DELETE FROM {$NAMESPACE}_repository.repository_auditrequest
+ WHERE auditStatus IN ('', 'cc', 'audit-not-required');
diff --git a/src/applications/audit/constants/PhabricatorAuditStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditStatusConstants.php
--- a/src/applications/audit/constants/PhabricatorAuditStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditStatusConstants.php
@@ -2,27 +2,19 @@
final class PhabricatorAuditStatusConstants extends Phobject {
- const NONE = '';
- const AUDIT_NOT_REQUIRED = 'audit-not-required';
const AUDIT_REQUIRED = 'audit-required';
const CONCERNED = 'concerned';
const ACCEPTED = 'accepted';
const AUDIT_REQUESTED = 'requested';
const RESIGNED = 'resigned';
- const CLOSED = 'closed';
- const CC = 'cc';
public static function getStatusNameMap() {
$map = array(
- self::NONE => pht('Not Applicable'),
- self::AUDIT_NOT_REQUIRED => pht('Audit Not Required'),
self::AUDIT_REQUIRED => pht('Audit Required'),
self::CONCERNED => pht('Concern Raised'),
self::ACCEPTED => pht('Accepted'),
self::AUDIT_REQUESTED => pht('Audit Requested'),
self::RESIGNED => pht('Resigned'),
- self::CLOSED => pht('Closed'),
- self::CC => pht("Was CC'd"),
);
return $map;
@@ -51,12 +43,6 @@
case self::ACCEPTED:
$color = 'green';
break;
- case self::AUDIT_NOT_REQUIRED:
- $color = 'blue';
- break;
- case self::CLOSED:
- $color = 'dark';
- break;
case self::RESIGNED:
$color = 'grey';
break;
@@ -69,9 +55,6 @@
public static function getStatusIcon($code) {
switch ($code) {
- case self::AUDIT_NOT_REQUIRED:
- $icon = PHUIStatusItemView::ICON_OPEN;
- break;
case self::AUDIT_REQUIRED:
case self::AUDIT_REQUESTED:
$icon = PHUIStatusItemView::ICON_WARNING;
@@ -80,7 +63,6 @@
$icon = PHUIStatusItemView::ICON_REJECT;
break;
case self::ACCEPTED:
- case self::CLOSED:
$icon = PHUIStatusItemView::ICON_ACCEPT;
break;
case self::RESIGNED:
diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -179,7 +179,6 @@
$object->attachAudits($commit->getAudits());
$status_concerned = PhabricatorAuditStatusConstants::CONCERNED;
- $status_closed = PhabricatorAuditStatusConstants::CLOSED;
$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
$status_accepted = PhabricatorAuditStatusConstants::ACCEPTED;
$status_concerned = PhabricatorAuditStatusConstants::CONCERNED;
@@ -491,12 +490,6 @@
}
foreach ($object->getAudits() as $audit) {
- if (!$audit->isInteresting()) {
- // Don't send mail to uninteresting auditors, like packages which
- // own this code but which audits have not triggered for.
- continue;
- }
-
if (!$audit->isResigned()) {
$phids[] = $audit->getAuditorPHID();
}
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -598,10 +598,6 @@
$other_requests = array();
foreach ($audit_requests as $audit_request) {
- if (!$audit_request->isInteresting()) {
- continue;
- }
-
if ($audit_request->isUser()) {
$user_requests[] = $audit_request;
} else {
diff --git a/src/applications/diffusion/herald/DiffusionAuditorsHeraldAction.php b/src/applications/diffusion/herald/DiffusionAuditorsHeraldAction.php
--- a/src/applications/diffusion/herald/DiffusionAuditorsHeraldAction.php
+++ b/src/applications/diffusion/herald/DiffusionAuditorsHeraldAction.php
@@ -38,9 +38,7 @@
$current = array();
foreach ($auditors as $auditor) {
- if ($auditor->isInteresting()) {
- $current[] = $auditor->getAuditorPHID();
- }
+ $current[] = $auditor->getAuditorPHID();
}
$allowed_types = array(
diff --git a/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php
@@ -22,9 +22,11 @@
$phids = array();
foreach ($audits as $audit) {
- if ($audit->isActiveAudit()) {
- $phids[] = $audit->getAuditorPHID();
+ if ($audit->isResigned()) {
+ continue;
}
+
+ $phids[] = $audit->getAuditorPHID();
}
return $phids;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
--- a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
@@ -49,29 +49,6 @@
return $this->assertAttached($this->commit);
}
- public function isActiveAudit() {
- switch ($this->getAuditStatus()) {
- case PhabricatorAuditStatusConstants::NONE:
- case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
- case PhabricatorAuditStatusConstants::RESIGNED:
- case PhabricatorAuditStatusConstants::CLOSED:
- case PhabricatorAuditStatusConstants::CC:
- return false;
- }
-
- return true;
- }
-
- public function isInteresting() {
- switch ($this->getAuditStatus()) {
- case PhabricatorAuditStatusConstants::NONE:
- case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
- return false;
- }
-
- return true;
- }
-
public function isResigned() {
switch ($this->getAuditStatus()) {
case PhabricatorAuditStatusConstants::RESIGNED:

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 27, 9:29 AM (5 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7708947
Default Alt Text
D21598.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility