Page MenuHomePhabricator
Files F15357883

D20679.id49321.diff
No OneTemporary
Actions

D20679.id49321.diff
View Options

diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableActionController.php b/src/applications/harbormaster/controller/HarbormasterBuildableActionController.php
--- a/src/applications/harbormaster/controller/HarbormasterBuildableActionController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableActionController.php
@@ -24,26 +24,27 @@
$issuable = array();
- foreach ($buildable->getBuilds() as $build) {
+ $builds = $buildable->getBuilds();
+ foreach ($builds as $key => $build) {
switch ($action) {
case HarbormasterBuildCommand::COMMAND_RESTART:
if ($build->canRestartBuild()) {
- $issuable[] = $build;
+ $issuable[$key] = $build;
}
break;
case HarbormasterBuildCommand::COMMAND_PAUSE:
if ($build->canPauseBuild()) {
- $issuable[] = $build;
+ $issuable[$key] = $build;
}
break;
case HarbormasterBuildCommand::COMMAND_RESUME:
if ($build->canResumeBuild()) {
- $issuable[] = $build;
+ $issuable[$key] = $build;
}
break;
case HarbormasterBuildCommand::COMMAND_ABORT:
if ($build->canAbortBuild()) {
- $issuable[] = $build;
+ $issuable[$key] = $build;
}
break;
default:
@@ -59,6 +60,14 @@
}
}
+ $building = false;
+ foreach ($issuable as $key => $build) {
+ if ($build->isBuilding()) {
+ $building = true;
+ break;
+ }
+ }
+
$return_uri = '/'.$buildable->getMonogram();
if ($request->isDialogFormPost() && $issuable) {
$editor = id(new HarbormasterBuildableTransactionEditor())
@@ -89,34 +98,137 @@
return id(new AphrontRedirectResponse())->setURI($return_uri);
}
+ $width = AphrontDialogView::WIDTH_DEFAULT;
+
switch ($action) {
case HarbormasterBuildCommand::COMMAND_RESTART:
- if ($issuable) {
- $title = pht('Really restart builds?');
+ // See T13348. The "Restart Builds" action may restart only a subset
+ // of builds, so show the user a preview of which builds will actually
+ // restart.
- if ($restricted) {
- $body = pht(
- 'You only have permission to restart some builds. Progress '.
- 'on builds you have permission to restart will be discarded '.
- 'and they will restart. Side effects of these builds will '.
- 'occur again. Really restart all builds?');
- } else {
- $body = pht(
- 'Progress on all builds will be discarded, and all builds will '.
- 'restart. Side effects of the builds will occur again. Really '.
- 'restart all builds?');
- }
+ $body = array();
+ if ($issuable) {
+ $title = pht('Restart Builds');
$submit = pht('Restart Builds');
} else {
$title = pht('Unable to Restart Builds');
+ }
+
+ if ($builds) {
+ $width = AphrontDialogView::WIDTH_FORM;
+
+ $body[] = pht('Builds for this buildable:');
+
+ $rows = array();
+ foreach ($builds as $key => $build) {
+ if (isset($issuable[$key])) {
+ $icon = id(new PHUIIconView())
+ ->setIcon('fa-repeat green');
+ $build_note = pht('Will Restart');
+ } else {
+ $icon = null;
+
+ try {
+ $build->assertCanRestartBuild();
+ } catch (HarbormasterRestartException $ex) {
+ $icon = id(new PHUIIconView())
+ ->setIcon('fa-times red');
+ $build_note = pht(
+ '%s: %s',
+ phutil_tag('strong', array(), pht('Not Restartable')),
+ $ex->getTitle());
+ }
+
+ if (!$icon) {
+ try {
+ $build->assertCanIssueCommand($viewer, $action);
+ } catch (PhabricatorPolicyException $ex) {
+ $icon = id(new PHUIIconView())
+ ->setIcon('fa-lock red');
+ $build_note = pht(
+ '%s: %s',
+ phutil_tag('strong', array(), pht('Not Restartable')),
+ pht('You do not have permission to restart this build.'));
+ }
+ }
+
+ if (!$icon) {
+ $icon = id(new PHUIIconView())
+ ->setIcon('fa-times red');
+ $build_note = pht('Will Not Restart');
+ }
+ }
+
+ $build_name = phutil_tag(
+ 'a',
+ array(
+ 'href' => $build->getURI(),
+ 'target' => '_blank',
+ ),
+ pht('%s %s', $build->getObjectName(), $build->getName()));
+
+ $rows[] = array(
+ $icon,
+ $build_name,
+ $build_note,
+ );
+ }
+
+ $table = id(new AphrontTableView($rows))
+ ->setHeaders(
+ array(
+ null,
+ pht('Build'),
+ pht('Action'),
+ ))
+ ->setColumnClasses(
+ array(
+ null,
+ 'pri',
+ 'wide',
+ ));
+
+ $table = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'mlt mlb',
+ ),
+ $table);
+
+ $body[] = $table;
+ }
+
+ if ($issuable) {
+ $warnings = array();
if ($restricted) {
- $body = pht('You do not have permission to restart any builds.');
+ $warnings[] = pht(
+ 'You only have permission to restart some builds.');
+ }
+
+ if ($building) {
+ $warnings[] = pht(
+ 'Progress on running builds will be discarded.');
+ }
+
+ $warnings[] = pht(
+ 'When a build is restarted, side effects associated with '.
+ 'the build may occur again.');
+
+ $body[] = id(new PHUIInfoView())
+ ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+ ->setErrors($warnings);
+
+ $body[] = pht('Really restart builds?');
+ } else {
+ if ($restricted) {
+ $body[] = pht('You do not have permission to restart any builds.');
} else {
- $body = pht('No builds can be restarted.');
+ $body[] = pht('No builds can be restarted.');
}
}
+
break;
case HarbormasterBuildCommand::COMMAND_PAUSE:
if ($issuable) {
@@ -193,6 +305,7 @@
$dialog = id(new AphrontDialogView())
->setUser($viewer)
+ ->setWidth($width)
->setTitle($title)
->appendChild($body)
->addCancelButton($return_uri);
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -128,7 +128,7 @@
$curtain->addAction(
id(new PhabricatorActionView())
->setIcon('fa-repeat')
- ->setName(pht('Restart All Builds'))
+ ->setName(pht('Restart Builds'))
->setHref($this->getApplicationURI($restart_uri))
->setWorkflow(true)
->setDisabled(!$can_restart || !$can_edit));
@@ -136,7 +136,7 @@
$curtain->addAction(
id(new PhabricatorActionView())
->setIcon('fa-pause')
- ->setName(pht('Pause All Builds'))
+ ->setName(pht('Pause Builds'))
->setHref($this->getApplicationURI($pause_uri))
->setWorkflow(true)
->setDisabled(!$can_pause || !$can_edit));
@@ -144,7 +144,7 @@
$curtain->addAction(
id(new PhabricatorActionView())
->setIcon('fa-play')
- ->setName(pht('Resume All Builds'))
+ ->setName(pht('Resume Builds'))
->setHref($this->getApplicationURI($resume_uri))
->setWorkflow(true)
->setDisabled(!$can_resume || !$can_edit));
@@ -152,7 +152,7 @@
$curtain->addAction(
id(new PhabricatorActionView())
->setIcon('fa-exclamation-triangle')
- ->setName(pht('Abort All Builds'))
+ ->setName(pht('Abort Builds'))
->setHref($this->getApplicationURI($abort_uri))
->setWorkflow(true)
->setDisabled(!$can_abort || !$can_edit));

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 12, 7:03 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223979
Default Alt Text
D20679.id49321.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility