Page MenuHomestyx hydra
Files F236011

No OneTemporary
Actions

View Options

diff --git a/src/applications/audit/view/PhabricatorAuditTransactionView.php b/src/applications/audit/view/PhabricatorAuditTransactionView.php
index ac5653e278..897440d9d7 100644
--- a/src/applications/audit/view/PhabricatorAuditTransactionView.php
+++ b/src/applications/audit/view/PhabricatorAuditTransactionView.php
@@ -1,129 +1,139 @@
<?php
final class PhabricatorAuditTransactionView
extends PhabricatorApplicationTransactionView {
private $pathMap = array();
public function setPathMap(array $path_map) {
$this->pathMap = $path_map;
return $this;
}
public function getPathMap() {
return $this->pathMap;
}
// TODO: This shares a lot of code with Differential and Pholio and should
// probably be merged up.
protected function shouldGroupTransactions(
PhabricatorApplicationTransaction $u,
PhabricatorApplicationTransaction $v) {
if ($u->getAuthorPHID() != $v->getAuthorPHID()) {
// Don't group transactions by different authors.
return false;
}
if (($v->getDateCreated() - $u->getDateCreated()) > 60) {
// Don't group if transactions that happened more than 60s apart.
return false;
}
switch ($u->getTransactionType()) {
case PhabricatorTransactions::TYPE_COMMENT:
case PhabricatorAuditActionConstants::INLINE:
break;
default:
return false;
}
switch ($v->getTransactionType()) {
case PhabricatorAuditActionConstants::INLINE:
return true;
}
return parent::shouldGroupTransactions($u, $v);
}
protected function renderTransactionContent(
PhabricatorApplicationTransaction $xaction) {
$out = array();
$type_inline = PhabricatorAuditActionConstants::INLINE;
$group = $xaction->getTransactionGroup();
if ($xaction->getTransactionType() == $type_inline) {
array_unshift($group, $xaction);
} else {
$out[] = parent::renderTransactionContent($xaction);
}
if ($this->getIsPreview()) {
return $out;
}
if (!$group) {
return $out;
}
$inlines = array();
foreach ($group as $xaction) {
switch ($xaction->getTransactionType()) {
case PhabricatorAuditActionConstants::INLINE:
$inlines[] = $xaction;
break;
default:
throw new Exception(pht('Unknown grouped transaction type!'));
}
}
- if ($inlines) {
-
- // TODO: This should do something similar to sortAndGroupInlines() to get
- // a stable ordering.
-
- $inlines_by_path = array();
- foreach ($inlines as $key => $inline) {
- $comment = $inline->getComment();
- if (!$comment) {
- // TODO: Migrate these away? They probably do not exist on normal
- // non-development installs.
- unset($inlines[$key]);
- continue;
- }
- $path_id = $comment->getPathID();
- $inlines_by_path[$path_id][] = $inline;
+ $structs = array();
+ foreach ($inlines as $key => $inline) {
+ $comment = $inline->getComment();
+ if (!$comment) {
+ // TODO: Migrate these away? They probably do not exist on normal
+ // non-development installs.
+ unset($inlines[$key]);
+ continue;
}
- $inline_view = new PhabricatorInlineSummaryView();
- foreach ($inlines_by_path as $path_id => $group) {
- $path = idx($this->pathMap, $path_id);
- if ($path === null) {
- continue;
- }
-
- $items = array();
- foreach ($group as $inline) {
- $comment = $inline->getComment();
- $item = array(
- 'id' => $comment->getID(),
- 'line' => $comment->getLineNumber(),
- 'length' => $comment->getLineLength(),
- 'content' => parent::renderTransactionContent($inline),
- );
- $items[] = $item;
- }
- $inline_view->addCommentGroup($path, $items);
+ $path_id = $comment->getPathID();
+ $path = idx($this->pathMap, $path_id);
+ if ($path === null) {
+ continue;
}
- $out[] = $inline_view;
+ $structs[] = array(
+ 'inline' => $inline,
+ 'path' => $path,
+ 'sort' => (string)id(new PhutilSortVector())
+ ->addString($path)
+ ->addInt($comment->getLineNumber())
+ ->addInt($comment->getLineLength())
+ ->addInt($inline->getID()),
+ );
+ }
+
+ if (!$structs) {
+ return $out;
+ }
+
+ $structs = isort($structs, 'sort');
+ $structs = igroup($structs, 'path');
+
+ $inline_view = new PhabricatorInlineSummaryView();
+ foreach ($structs as $path => $group) {
+ $inlines = ipull($group, 'inline');
+ $items = array();
+ foreach ($inlines as $inline) {
+ $comment = $inline->getComment();
+ $items[] = array(
+ 'id' => $comment->getID(),
+ 'line' => $comment->getLineNumber(),
+ 'length' => $comment->getLineLength(),
+ 'content' => parent::renderTransactionContent($inline),
+ );
+ }
+ $inline_view->addCommentGroup($path, $items);
}
+ $out[] = $inline_view;
+
return $out;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 29, 6:57 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
188215
Default Alt Text
(5 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)