diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => '3c8a0668', 'conpherence.pkg.js' => '020aebcf', - 'core.pkg.css' => '9a391b14', + 'core.pkg.css' => '77de226f', 'core.pkg.js' => '6e5c894f', 'differential.pkg.css' => '607c84be', 'differential.pkg.js' => '1b97518d', @@ -30,7 +30,7 @@ 'rsrc/css/aphront/notification.css' => '30240bd2', 'rsrc/css/aphront/panel-view.css' => '46923d46', 'rsrc/css/aphront/phabricator-nav-view.css' => 'f8a0c1bf', - 'rsrc/css/aphront/table-view.css' => '061e45eb', + 'rsrc/css/aphront/table-view.css' => '0bb61df1', 'rsrc/css/aphront/tokenizer.css' => 'b52d0668', 'rsrc/css/aphront/tooltip.css' => 'e3f2412f', 'rsrc/css/aphront/typeahead-browse.css' => 'b7ed02d2', @@ -535,7 +535,7 @@ 'aphront-list-filter-view-css' => 'feb64255', 'aphront-multi-column-view-css' => 'fbc00ba3', 'aphront-panel-view-css' => '46923d46', - 'aphront-table-view-css' => '061e45eb', + 'aphront-table-view-css' => '0bb61df1', 'aphront-tokenizer-control-css' => 'b52d0668', 'aphront-tooltip-css' => 'e3f2412f', 'aphront-typeahead-control-css' => '8779483d', diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -593,6 +593,7 @@ $handle_phids = array(); $any_linked = false; + $any_status = false; $idx = 0; $objects = array(); @@ -623,7 +624,6 @@ ->setIcon($status->getIcon()) ->setColor($status->getColor()) ->setName($status->getName()); - } } @@ -750,9 +750,9 @@ if ($repository_phid !== $last_repository) { $repository_link = null; if ($repository_phid) { - $repository_link = $handles[$repository_phid]->renderLink(); + $repository_handle = $handles[$repository_phid]; $rows[] = array( - $repository_link, + $repository_handle->renderLink(), ); $rowd[] = true; } @@ -772,6 +772,9 @@ ->setIcon($handle->getIcon()); $status_view = $object['status']; + if ($status_view) { + $any_status = true; + } $revision_tags = array(); foreach ($object['revisionPHIDs'] as $link_phid) { @@ -797,16 +800,9 @@ $changes_table = id(new AphrontTableView($rows)) ->setNoDataString(pht('This task has no related commits or revisions.')) ->setRowDividers($rowd) - ->setHeaders( - array( - null, - null, - null, - pht('Revision/Commit'), - )) ->setColumnClasses( array( - 'center', + 'indent center', null, null, 'wide pri object-link', @@ -814,14 +810,14 @@ ->setColumnVisibility( array( true, - true, + $any_status, $any_linked, true, )) ->setDeviceVisibility( array( false, - true, + $any_status, false, true, )); diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php --- a/src/view/control/AphrontTableView.php +++ b/src/view/control/AphrontTableView.php @@ -306,7 +306,7 @@ 'td', array( 'class' => 'row-divider', - 'colspan' => count($headers), + 'colspan' => count($visibility), ), $value); $row_idx = -1; diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css --- a/webroot/rsrc/css/aphront/table-view.css +++ b/webroot/rsrc/css/aphront/table-view.css @@ -61,6 +61,10 @@ padding: 8px 12px; } +.aphront-table-view td.indent { + padding-left: 24px; +} + .aphront-table-view th { border-bottom: 1px solid {$thinblueborder}; }