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

Merge author and committer

Browse source 
Summary: These columns holds the same value in most cases which irritates me.

Test Plan: Displayed history with same author and committer, emulated different committer.

Reviewers: hsb, epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2671
This commit is contained in:
vrana 2012-06-07 12:26:19 -07:00
parent 2d52881d4e
commit bed3a9817b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/applications/diffusion/view/DiffusionHistoryTableView.php
View file

@ -98,17 +98,20 @@ final class DiffusionHistoryTableView extends DiffusionView {
$author = phutil_escape_html($history->getAuthorName());
}
if ($committer) {
$different_committer = false;
if ($committer_phid) {
$different_committer = ($committer_phid != $author_phid);
} else if ($committer != '') {
$different_committer = ($committer != $history->getAuthorName());
}
if ($different_committer) {
if ($committer_phid && isset($handles[$committer_phid])) {
$committer = $handles[$committer_phid]->renderLink();
} else {
$committer = phutil_escape_html($committer);
}
$author .= '/'.$committer;
}
else {
$committer = $author;
}
$commit = $history->getCommit();
if ($commit && !$commit->getIsUnparsed() && $data) {
@ -135,7 +138,6 @@ final class DiffusionHistoryTableView extends DiffusionView {
$date,
$time,
$author,
$committer,
AphrontTableView::renderSingleDisplayLine(
phutil_escape_html($history->getSummary())),
// TODO: etc etc
@ -151,8 +153,7 @@ final class DiffusionHistoryTableView extends DiffusionView {
'Change',
'Date',
'Time',
'Author',
'Committer',
'Author/Committer',
'Details',
));
$view->setColumnClasses(
@ -164,7 +165,6 @@ final class DiffusionHistoryTableView extends DiffusionView {
'',
'right',
'',
'',
'wide',
));
$view->setColumnVisibility(