Page MenuHomePhabricator
Files F15283073

D8470.diff
No OneTemporary
Actions

D8470.diff
View Options

diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
--- a/src/applications/differential/controller/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
@@ -94,35 +94,10 @@
$diff->getID());
$props = mpull($props, 'getData', 'getName');
- $aux_fields = DifferentialFieldSelector::newSelector()
- ->getFieldSpecifications();
- foreach ($aux_fields as $key => $aux_field) {
- if (!$aux_field->shouldAppearOnDiffView()) {
- unset($aux_fields[$key]);
- } else {
- $aux_field->setUser($this->getRequest()->getUser());
- }
- }
-
- $dict = array();
- foreach ($aux_fields as $key => $aux_field) {
- $aux_field->setDiff($diff);
- $aux_field->setManualDiff($diff);
- $aux_field->setDiffProperties($props);
- $value = $aux_field->renderValueForDiffView();
- if (strlen($value)) {
- $label = rtrim($aux_field->renderLabelForDiffView(), ':');
- $dict[$label] = $value;
- }
- }
-
$property_head = id(new PHUIHeaderView())
->setHeader(pht('Properties'));
$property_view = new PHUIPropertyListView();
- foreach ($dict as $key => $value) {
- $property_view->addProperty($key, $value);
- }
$changesets = $diff->loadChangesets();
$changesets = msort($changesets, 'getSortKey');
diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
--- a/src/applications/differential/controller/DifferentialRevisionListController.php
+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
@@ -30,8 +30,7 @@
$user = $this->getRequest()->getUser();
$template = id(new DifferentialRevisionListView())
- ->setUser($user)
- ->setFields(DifferentialRevisionListView::getDefaultFields($user));
+ ->setUser($user);
$views = array();
if ($query->getQueryKey() == 'active') {
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -766,7 +766,6 @@
$view = id(new DifferentialRevisionListView())
->setRevisions($revisions)
- ->setFields(DifferentialRevisionListView::getDefaultFields($user))
->setUser($user);
$phids = $view->getRequiredHandlePHIDs();
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -7,7 +7,6 @@
private $revisions;
private $handles;
- private $fields;
private $highlightAge;
private $header;
private $noDataString;
@@ -22,12 +21,6 @@
return $this;
}
- public function setFields(array $fields) {
- assert_instances_of($fields, 'DifferentialFieldSpecification');
- $this->fields = $fields;
- return $this;
- }
-
public function setRevisions(array $revisions) {
assert_instances_of($revisions, 'DifferentialRevision');
$this->revisions = $revisions;
@@ -41,10 +34,12 @@
public function getRequiredHandlePHIDs() {
$phids = array();
- foreach ($this->fields as $field) {
- foreach ($this->revisions as $revision) {
- $phids[] = $field->getRequiredHandlePHIDsForRevisionList($revision);
- }
+ foreach ($this->revisions as $revision) {
+ $phids[] = array($revision->getAuthorPHID());
+
+ // TODO: Switch to getReviewerStatus(), but not all callers pass us
+ // revisions with this data loaded.
+ $phids[] = $revision->getReviewers();
}
return array_mergev($phids);
}
@@ -79,10 +74,6 @@
$this->initBehavior('phabricator-tooltips', array());
$this->requireResource('aphront-tooltip-css');
- foreach ($this->fields as $field) {
- $field->setHandles($this->handles);
- }
-
$list = new PHUIObjectItemListView();
$list->setCards(true);
@@ -90,7 +81,6 @@
$item = id(new PHUIObjectItemView())
->setUser($user);
- $rev_fields = array();
$icons = array();
$phid = $revision->getPHID();
@@ -116,21 +106,12 @@
$this->highlightAge &&
!$revision->isClosed();
- $object_age = PHUIObjectItemView::AGE_FRESH;
- foreach ($this->fields as $field) {
- if ($show_age) {
- if ($field instanceof DifferentialDateModifiedFieldSpecification) {
- if ($stale && $modified < $stale) {
- $object_age = PHUIObjectItemView::AGE_OLD;
- } else if ($fresh && $modified < $fresh) {
- $object_age = PHUIObjectItemView::AGE_STALE;
- }
- }
- }
-
- $rev_header = $field->renderHeaderForRevisionList();
- $rev_fields[$rev_header] = $field
- ->renderValueForRevisionList($revision);
+ if ($stale && $modified < $stale) {
+ $object_age = PHUIObjectItemView::AGE_OLD;
+ } else if ($fresh && $modified < $fresh) {
+ $object_age = PHUIObjectItemView::AGE_STALE;
+ } else {
+ $object_age = PHUIObjectItemView::AGE_FRESH;
}
$status_name =
@@ -163,21 +144,20 @@
$author_handle = $this->handles[$revision->getAuthorPHID()];
$item->addByline(pht('Author: %s', $author_handle->renderLink()));
- // Reviewers
- $item->addAttribute(pht('Reviewers: %s', $rev_fields['Reviewers']));
+ $reviewers = array();
+ // TODO: As above, this should be based on `getReviewerStatus()`.
+ foreach ($revision->getReviewers() as $reviewer) {
+ $reviewers[] = $this->handles[$reviewer]->renderLink();
+ }
+ if (!$reviewers) {
+ $reviewers = phutil_tag('em', array(), pht('None'));
+ } else {
+ $reviewers = phutil_implode_html(', ', $reviewers);
+ }
+ $item->addAttribute(pht('Reviewers: %s', $reviewers));
$item->setEpoch($revision->getDateModified(), $object_age);
- // First remove the fields we already have
- $count = 7;
- $rev_fields = array_slice($rev_fields, $count);
-
- // Then add each one of them
- // TODO: Add render-to-foot-icon support
- foreach ($rev_fields as $header => $field) {
- $item->addAttribute(pht('%s: %s', $header, $field));
- }
-
switch ($status) {
case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
break;
@@ -205,23 +185,4 @@
return $list;
}
- public static function getDefaultFields(PhabricatorUser $user) {
- $selector = DifferentialFieldSelector::newSelector();
- $fields = $selector->getFieldSpecifications();
- foreach ($fields as $key => $field) {
- $field->setUser($user);
- if (!$field->shouldAppearOnRevisionList()) {
- unset($fields[$key]);
- }
- }
-
- if (!$fields) {
- throw new Exception(
- "Phabricator configuration has no fields that appear on the list ".
- "interface!");
- }
-
- return $selector->sortFieldsForRevisionList($fields);
- }
-
}
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -211,7 +211,6 @@
$view = id(new DifferentialRevisionListView())
->setRevisions($revisions)
- ->setFields(DifferentialRevisionListView::getDefaultFields($user))
->setUser($user);
$phids = $view->getRequiredHandlePHIDs();
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -219,7 +219,6 @@
$revision_view = id(new DifferentialRevisionListView())
->setHighlightAge(true)
->setRevisions(array_merge($blocking, $active))
- ->setFields(DifferentialRevisionListView::getDefaultFields($user))
->setUser($user);
$phids = array_merge(
array($user_phid),

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 5:07 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223602
Default Alt Text
D8470.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility