Page MenuHomePhabricator
Files F15407851

D17531.diff
No OneTemporary
Actions

D17531.diff
View Options

diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -29,6 +29,14 @@
}
$phids = array_fuse($phids);
+ // Before continuing, throw away any revisions which responsible users
+ // have explicitly resigned from.
+
+ // The goal is to allow users to resign from revisions they don't want to
+ // review to get these revisions off their dashboard, even if there are
+ // other project or package reviewers which they have authority over.
+ $this->filterResigned($phids);
+
$groups = array();
$groups[] = $this->newGroup()
@@ -229,4 +237,25 @@
return $results;
}
+ private function filterResigned(array $phids) {
+ $resigned = array(
+ DifferentialReviewerStatus::STATUS_RESIGNED,
+ );
+ $resigned = array_fuse($resigned);
+
+ $objects = $this->getRevisionsNotAuthored($this->objects, $phids);
+
+ $results = array();
+ foreach ($objects as $key => $object) {
+ if (!$this->hasReviewersWithStatus($object, $phids, $resigned)) {
+ continue;
+ }
+
+ $results[$key] = $object;
+ unset($this->objects[$key]);
+ }
+
+ return $results;
+ }
+
}
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -42,4 +42,9 @@
return $this->assertAttachedKey($this->authority, $cache_fragment);
}
+ public function isResigned() {
+ $status_resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
+ return ($this->getReviewerStatus() == $status_resigned);
+ }
+
}
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -25,9 +25,23 @@
public function render() {
$viewer = $this->getUser();
+ $reviewers = $this->reviewers;
$view = new PHUIStatusListView();
- foreach ($this->reviewers as $reviewer) {
+
+ // Move resigned reviewers to the bottom.
+ $head = array();
+ $tail = array();
+ foreach ($reviewers as $key => $reviewer) {
+ if ($reviewer->isResigned()) {
+ $tail[$key] = $reviewer;
+ } else {
+ $head[$key] = $reviewer;
+ }
+ }
+
+ $reviewers = $head + $tail;
+ foreach ($reviewers as $reviewer) {
$phid = $reviewer->getReviewerPHID();
$handle = $this->handles[$phid];
@@ -98,6 +112,13 @@
pht('Blocking Review'));
break;
+ case DifferentialReviewerStatus::STATUS_RESIGNED:
+ $item->setIcon(
+ 'fa-times',
+ 'grey',
+ pht('Resigned'));
+ break;
+
default:
$item->setIcon(
PHUIStatusItemView::ICON_QUESTION,
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
@@ -178,16 +178,10 @@
$reviewer->setLastActionDiffPHID($diff_phid);
}
- if ($status == DifferentialReviewerStatus::STATUS_RESIGNED) {
- if ($reviewer->getID()) {
- $reviewer->delete();
- }
- } else {
- try {
- $reviewer->save();
- } catch (AphrontDuplicateKeyQueryException $ex) {
- // At least for now, just ignore it if we lost a race.
- }
+ try {
+ $reviewer->save();
+ } catch (AphrontDuplicateKeyQueryException $ex) {
+ // At least for now, just ignore it if we lost a race.
}
}
}

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 7:56 PM (26 m, 58 s)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7227637
Default Alt Text
D17531.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility