revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-27 01:02:42 +01:00
Code Issues Releases Wiki Activity

Join author and committer in Diffusion browse

Browse source 
Summary: Consistent with history view, simpler.

Test Plan: /diffusion/X/

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3230
This commit is contained in:
vrana 2012-08-09 18:11:56 -07:00
parent dbde4b9ff2
commit 81946fc08d
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/applications/diffusion/view/DiffusionBrowseTableView.php
View file

@ -73,10 +73,11 @@ final class DiffusionBrowseTableView extends DiffusionView {
if ($committer_phid && isset($handles[$committer_phid])) { if ($committer_phid && isset($handles[$committer_phid])) {
$committer = $handles[$committer_phid]->renderLink(); $committer = $handles[$committer_phid]->renderLink();
} else { } else {
$committer = self::renderName($data->getCommitDetail('committer')); $committer = self::renderName($committer);
}
if ($author != $committer) {
$author .= '/'.$committer;
} }
} else {
$committer = $author;
} }
$details = AphrontTableView::renderSingleDisplayLine( $details = AphrontTableView::renderSingleDisplayLine(
@ -84,7 +85,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
} else { } else {
$author = ''; $author = '';
$details = ''; $details = '';
$committer = '';
} }
return array( return array(
@ -92,7 +92,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
'date' => $date, 'date' => $date,
'time' => $time, 'time' => $time,
'author' => $author, 'author' => $author,
'committer' => $committer,
'details' => $details, 'details' => $details,
); );
} }
@ -162,7 +161,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
'date' => celerity_generate_unique_node_id(), 'date' => celerity_generate_unique_node_id(),
'time' => celerity_generate_unique_node_id(), 'time' => celerity_generate_unique_node_id(),
'author' => celerity_generate_unique_node_id(), 'author' => celerity_generate_unique_node_id(),
'committer' => celerity_generate_unique_node_id(),
'details' => celerity_generate_unique_node_id(), 'details' => celerity_generate_unique_node_id(),
); );
@ -203,7 +201,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
$dict['date'], $dict['date'],
$dict['time'], $dict['time'],
$dict['author'], $dict['author'],
$dict['committer'],
$dict['details'], $dict['details'],
); );
} }
@ -221,8 +218,7 @@ final class DiffusionBrowseTableView extends DiffusionView {
'Modified', 'Modified',
'Date', 'Date',
'Time', 'Time',
'Author', 'Author/Committer',
'Committer',
'Details', 'Details',
)); ));
$view->setColumnClasses( $view->setColumnClasses(
@ -234,7 +230,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
'', '',
'right', 'right',
'', '',
'',
'wide', 'wide',
)); ));
$view->setColumnVisibility( $view->setColumnVisibility(
@ -247,7 +242,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
true, true,
true, true,
true, true,
true,
)); ));
return $view->render(); return $view->render();
} }