D15543.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15543.diff
View Options

	diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
	--- a/src/view/phui/PHUITimelineEventView.php
	+++ b/src/view/phui/PHUITimelineEventView.php
	@@ -342,6 +342,8 @@
	// Render "extra" information (timestamp, etc).
	$extra = $this->renderExtra($events);

	+ $show_badges = false;
	+
	$group_titles = array();
	$group_items = array();
	$group_children = array();
	@@ -358,6 +360,7 @@

	if ($event->hasChildren()) {
	$group_children[] = $event->renderChildren();
	+ $show_badges = true;
	}
	}

	@@ -382,7 +385,7 @@
	'href' => $this->userHandle->getURI(),
	),
	'');
	- if ($this->badges) {
	+ if ($this->badges && $show_badges) {
	$flex = new PHUIBadgeBoxView();
	$flex->addItems($this->badges);
	$flex->setCollapsed(true);
	diff --git a/src/view/phui/PHUITimelineView.php b/src/view/phui/PHUITimelineView.php
	--- a/src/view/phui/PHUITimelineView.php
	+++ b/src/view/phui/PHUITimelineView.php
	@@ -224,12 +224,6 @@

	$user_phids = array();
	foreach ($events as $key => $event) {
	- if (!$event->hasChildren()) {
	- // This is a minor event, so we don't have space to show badges.
	- unset($events[$key]);
	- continue;
	- }
	-
	$author_phid = $event->getAuthorPHID();
	if (!$author_phid) {
	unset($events[$key]);
	@@ -259,7 +253,9 @@
	$awards = mgroup($awards, 'getRecipientPHID');

	foreach ($events as $event) {
	+
	$author_awards = idx($awards, $event->getAuthorPHID(), array());
	+
	$badges = array();
	foreach ($author_awards as $award) {
	$badge = $award->getBadge();