From f8737d15cab76fb8fead63b9d54e5d572e07d33d Mon Sep 17 00:00:00 2001 From: Bob Trahan Date: Mon, 12 Nov 2012 13:35:44 -0800 Subject: [PATCH] Differential - special-case "no reviewers" warning to show only for revions that need review Summary: 'cuz who cares unless you need review? Test Plan: noted the UI showed up appropriately to my new business logix Reviewers: epriestley, chad Reviewed By: chad CC: aran, Korvin Maniphest Tasks: T2010 Differential Revision: https://secure.phabricator.com/D3958 --- .../DifferentialRevisionViewController.php | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 0c9b7c662e..2f7f76fc7c 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -137,24 +137,36 @@ final class DifferentialRevisionViewController extends DifferentialController { } $reviewer_warning = null; - $has_live_reviewer = false; - foreach ($revision->getReviewers() as $reviewer) { - if (!$handles[$reviewer]->isDisabled()) { - $has_live_reviewer = true; + if ($revision->getStatus() == + ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) { + $has_live_reviewer = false; + foreach ($revision->getReviewers() as $reviewer) { + if (!$handles[$reviewer]->isDisabled()) { + $has_live_reviewer = true; + break; + } } - } - if (!$has_live_reviewer) { - $reviewer_warning = new AphrontErrorView(); - $reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING); - $reviewer_warning->setTitle('No Active Reviewers'); - if ($revision->getReviewers()) { - $reviewer_warning->appendChild( - '

All specified reviewers are disabled. You may want to add '. - 'some new reviewers.

'); - } else { - $reviewer_warning->appendChild( - '

This revision has no specified reviewers. You may want to '. - 'add some.

'); + if (!$has_live_reviewer) { + $reviewer_warning = new AphrontErrorView(); + $reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING); + $reviewer_warning->setTitle('No Active Reviewers'); + if ($revision->getReviewers()) { + $reviewer_warning->appendChild( + phutil_render_tag( + 'p', + array(), + pht('All specified reviewers are disabled and this revision '. + 'needs review. You may want to add some new reviewers.') + )); + } else { + $reviewer_warning->appendChild( + phutil_render_tag( + 'p', + array(), + pht('This revision has no specified reviewers and needs review.'. + ' You may want to add some reviewers.') + )); + } } }