From 81946fc08d8a737b278255090e296ca92164d672 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Thu, 9 Aug 2012 18:11:56 -0700
Subject: [PATCH] Join author and committer in Diffusion browse

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
---
 .../diffusion/view/DiffusionBrowseTableView.php  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

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