Page MenuHomePhabricator

D16258.id39108.diff
No OneTemporary

D16258.id39108.diff

diff --git a/src/applications/notification/builder/PhabricatorNotificationBuilder.php b/src/applications/notification/builder/PhabricatorNotificationBuilder.php
--- a/src/applications/notification/builder/PhabricatorNotificationBuilder.php
+++ b/src/applications/notification/builder/PhabricatorNotificationBuilder.php
@@ -5,6 +5,7 @@
private $stories;
private $parsedStories;
private $user = null;
+ private $showTimestamps = true;
public function __construct(array $stories) {
assert_instances_of($stories, 'PhabricatorFeedStory');
@@ -16,6 +17,15 @@
return $this;
}
+ public function setShowTimestamps($show_timestamps) {
+ $this->showTimestamps = $show_timestamps;
+ return $this;
+ }
+
+ public function getShowTimestamps() {
+ return $this->showTimestamps;
+ }
+
private function parseStories() {
if ($this->parsedStories) {
@@ -121,6 +131,9 @@
// TODO: Render a nice debuggable notice instead?
continue;
}
+
+ $view->setShowTimestamp($this->getShowTimestamps());
+
$null_view->appendChild($view->renderNotification($this->user));
}
diff --git a/src/applications/notification/controller/PhabricatorNotificationIndividualController.php b/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
--- a/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
@@ -31,7 +31,8 @@
}
$builder = id(new PhabricatorNotificationBuilder(array($story)))
- ->setUser($viewer);
+ ->setUser($viewer)
+ ->setShowTimestamps(false);
$content = $builder->buildView()->render();
$dict = $builder->buildDict();
diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
--- a/src/view/phui/PHUIFeedStoryView.php
+++ b/src/view/phui/PHUIFeedStoryView.php
@@ -17,6 +17,7 @@
private $chronologicalKey;
private $tags;
private $authorIcon;
+ private $showTimestamp = true;
public function setTags($tags) {
$this->tags = $tags;
@@ -97,6 +98,15 @@
return $this;
}
+ public function setShowTimestamp($show_timestamp) {
+ $this->showTimestamp = $show_timestamp;
+ return $this;
+ }
+
+ public function getShowTimestamp() {
+ return $this->showTimestamp;
+ }
+
public function addProject($project) {
$this->projects[] = $project;
return $this;
@@ -136,20 +146,25 @@
if (!$this->viewed) {
$classes[] = 'phabricator-notification-unread';
}
- if ($this->epoch) {
- if ($user) {
- $foot = phabricator_datetime($this->epoch, $user);
- $foot = phutil_tag(
- 'span',
- array(
- 'class' => 'phabricator-notification-date',
- ),
- $foot);
+
+ if ($this->getShowTimestamp()) {
+ if ($this->epoch) {
+ if ($user) {
+ $foot = phabricator_datetime($this->epoch, $user);
+ $foot = phutil_tag(
+ 'span',
+ array(
+ 'class' => 'phabricator-notification-date',
+ ),
+ $foot);
+ } else {
+ $foot = null;
+ }
} else {
- $foot = null;
+ $foot = pht('No time specified.');
}
} else {
- $foot = pht('No time specified.');
+ $foot = null;
}
return javelin_tag(

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 30, 12:53 PM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7414353
Default Alt Text
D16258.id39108.diff (3 KB)

Event Timeline