1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-19 20:10:55 +01:00

Don't show error operations after a successful land operation

Summary:
Ref T182. When viewing a revision, if there are several error operations and then a success operation, we currently show the last error. This is misleading.

Instead, don't show anything if there's a success (this may require tuning eventually if you can land multiple times onto different branches or whatever, but should be reasonable for now).

Also make the table a little nicer, particularly for merge failure output.

Test Plan: {F910385}

Reviewers: chad, Mnkras

Reviewed By: Mnkras

Maniphest Tasks: T182

Differential Revision: https://secure.phabricator.com/D14348
This commit is contained in:
epriestley 2015-10-26 21:27:04 +00:00 committed by epriestley
parent 6e7ceb996b
commit cea633f698
4 changed files with 11 additions and 10 deletions

View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => 'c65b251d', 'core.pkg.css' => 'd80f5c3e',
'core.pkg.js' => '47dc9ebb', 'core.pkg.js' => '47dc9ebb',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9', 'differential.pkg.css' => '2de124c9',
@ -25,7 +25,7 @@ return array(
'rsrc/css/aphront/notification.css' => '9c279160', 'rsrc/css/aphront/notification.css' => '9c279160',
'rsrc/css/aphront/panel-view.css' => '8427b78d', 'rsrc/css/aphront/panel-view.css' => '8427b78d',
'rsrc/css/aphront/phabricator-nav-view.css' => 'a24cb589', 'rsrc/css/aphront/phabricator-nav-view.css' => 'a24cb589',
'rsrc/css/aphront/table-view.css' => '63985f5b', 'rsrc/css/aphront/table-view.css' => '61543e7a',
'rsrc/css/aphront/tokenizer.css' => '04875312', 'rsrc/css/aphront/tokenizer.css' => '04875312',
'rsrc/css/aphront/tooltip.css' => '7672b60f', 'rsrc/css/aphront/tooltip.css' => '7672b60f',
'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c', 'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c',
@ -493,7 +493,7 @@ return array(
'aphront-list-filter-view-css' => '5d6f0526', 'aphront-list-filter-view-css' => '5d6f0526',
'aphront-multi-column-view-css' => 'fd18389d', 'aphront-multi-column-view-css' => 'fd18389d',
'aphront-panel-view-css' => '8427b78d', 'aphront-panel-view-css' => '8427b78d',
'aphront-table-view-css' => '63985f5b', 'aphront-table-view-css' => '61543e7a',
'aphront-tokenizer-control-css' => '04875312', 'aphront-tokenizer-control-css' => '04875312',
'aphront-tooltip-css' => '7672b60f', 'aphront-tooltip-css' => '7672b60f',
'aphront-typeahead-control-css' => '0e403212', 'aphront-typeahead-control-css' => '0e403212',

View file

@ -1051,12 +1051,6 @@ final class DifferentialRevisionViewController extends DifferentialController {
array( array(
DrydockLandRepositoryOperation::OPCONST, DrydockLandRepositoryOperation::OPCONST,
)) ))
->withOperationStates(
array(
DrydockRepositoryOperation::STATE_WAIT,
DrydockRepositoryOperation::STATE_WORK,
DrydockRepositoryOperation::STATE_FAIL,
))
->execute(); ->execute();
if (!$operations) { if (!$operations) {
return null; return null;
@ -1073,6 +1067,12 @@ final class DifferentialRevisionViewController extends DifferentialController {
} }
} }
// If we found a completed operation, don't render anything. We don't want
// to show an older error after the thing worked properly.
if ($operation->isDone()) {
return null;
}
$box_view = id(new PHUIObjectBoxView()) $box_view = id(new PHUIObjectBoxView())
->setHeaderText(pht('Active Operations')); ->setHeaderText(pht('Active Operations'));

View file

@ -115,7 +115,7 @@ final class DrydockRepositoryOperationStatusView
->setColumnClasses( ->setColumnClasses(
array( array(
'header', 'header',
'wide', 'wide prewrap',
)); ));
return $table; return $table;

View file

@ -61,6 +61,7 @@ th.aphront-table-view-sortable-selected {
text-align: right; text-align: right;
color: {$bluetext}; color: {$bluetext};
font-weight: bold; font-weight: bold;
vertical-align: top;
} }
.aphront-table-view td { .aphront-table-view td {