archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Move getPrimaryReviewer() to DifferentialRevision

Browse Source 
Test Plan: Display revision list both with last reviewer and without.

Reviewers: epriestley, btrahan

Reviewed By: btrahan

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2495
This commit is contained in:
vrana
2012-05-18 00:33:21 -07:00
parent 9f35a3ba45
commit db1f94b0c0
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php
View File

@@ -140,7 +140,7 @@ final class DifferentialReviewersFieldSpecification
} }
public function renderValueForRevisionList(DifferentialRevision $revision) { public function renderValueForRevisionList(DifferentialRevision $revision) {
$primary_reviewer = $this->getPrimaryReviewer($revision); $primary_reviewer = $revision->getPrimaryReviewer();
if ($primary_reviewer) { if ($primary_reviewer) {
$other_reviewers = array_flip($revision->getReviewers()); $other_reviewers = array_flip($revision->getReviewers());
unset($other_reviewers[$primary_reviewer]); unset($other_reviewers[$primary_reviewer]);
@@ -157,19 +157,11 @@ final class DifferentialReviewersFieldSpecification
public function getRequiredHandlePHIDsForRevisionList( public function getRequiredHandlePHIDsForRevisionList(
DifferentialRevision $revision) { DifferentialRevision $revision) {
$primary_reviewer = $this->getPrimaryReviewer($revision); $primary_reviewer = $revision->getPrimaryReviewer();
if ($primary_reviewer) { if ($primary_reviewer) {
return array($primary_reviewer); return array($primary_reviewer);
} }
return array(); return array();
} }
private function getPrimaryReviewer(DifferentialRevision $revision) {
$primary_reviewer = $revision->getLastReviewerPHID();
if (!$primary_reviewer) {
$primary_reviewer = head($revision->getReviewers());
}
return $primary_reviewer;
}
} }

7
src/applications/differential/storage/revision/DifferentialRevision.php
View File

@@ -206,6 +206,13 @@ final class DifferentialRevision extends DifferentialDAO {
return array_keys($this->getUnsubscribed()); return array_keys($this->getUnsubscribed());
} }
public function getPrimaryReviewer() {
if (!$this->lastReviewerPHID) {
return head($this->getReviewers());
}
return $this->lastReviewerPHID;
}
public function loadReviewedBy() { public function loadReviewedBy() {
$reviewer = null; $reviewer = null;