Page MenuHomestyx hydra
Files F1990243

No OneTemporary
Actions

View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
index cf4cde5308..0cdfa4c4b3 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
@@ -1,157 +1,193 @@
<?php
final class PhabricatorCalendarEventCancelController
extends PhabricatorCalendarController {
public function handleRequest(AphrontRequest $request) {
$viewer = $request->getViewer();
$id = $request->getURIData('id');
// Just check CAN_VIEW first. Then we'll check if this is an import so
// we can raise a better error.
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($viewer)
->withIDs(array($id))
->executeOne();
if (!$event) {
return new Aphront404Response();
}
$response = $this->newImportedEventResponse($event);
if ($response) {
return $response;
}
// Now that we've done the import check, check for CAN_EDIT.
PhabricatorPolicyFilter::requireCapability(
$viewer,
$event,
PhabricatorPolicyCapability::CAN_EDIT);
$cancel_uri = $event->getURI();
$is_parent = $event->isParentEvent();
$is_child = $event->isChildEvent();
$is_cancelled = $event->getIsCancelled();
$is_recurring = $event->getIsRecurring();
$validation_exception = null;
if ($request->isFormPost()) {
$targets = array($event);
if ($is_recurring) {
$mode = $request->getStr('mode');
$is_future = ($mode == 'future');
// We need to fork the event if we're cancelling just the parent, or
// are cancelling a child and all future events.
$must_fork = ($is_child && $is_future) ||
($is_parent && !$is_future);
if ($must_fork) {
$fork_target = $event->loadForkTarget($viewer);
if ($fork_target) {
$xactions = array();
$xaction = id(new PhabricatorCalendarEventTransaction())
->setTransactionType(
PhabricatorCalendarEventForkTransaction::TRANSACTIONTYPE)
->setNewValue(true);
$editor = id(new PhabricatorCalendarEventEditor())
->setActor($viewer)
->setContentSourceFromRequest($request)
->setContinueOnNoEffect(true)
->setContinueOnMissingFields(true);
$editor->applyTransactions($fork_target, array($xaction));
}
}
if ($is_future) {
$future = $event->loadFutureEvents($viewer);
foreach ($future as $future_event) {
$targets[] = $future_event;
}
}
}
foreach ($targets as $target) {
$xactions = array();
$xaction = id(new PhabricatorCalendarEventTransaction())
->setTransactionType(
PhabricatorCalendarEventCancelTransaction::TRANSACTIONTYPE)
->setNewValue(!$is_cancelled);
$editor = id(new PhabricatorCalendarEventEditor())
->setActor($viewer)
->setContentSourceFromRequest($request)
->setContinueOnNoEffect(true)
->setContinueOnMissingFields(true);
try {
$editor->applyTransactions($target, array($xaction));
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
break;
}
}
if (!$validation_exception) {
return id(new AphrontRedirectResponse())->setURI($cancel_uri);
}
}
if ($is_cancelled) {
$title = pht('Reinstate Event');
if ($is_recurring) {
$body = pht(
'This event is part of a series. Which events do you want to '.
'reinstate?');
$show_control = true;
} else {
$body = pht('Reinstate this event?');
$show_control = false;
}
$submit = pht('Reinstate Event');
} else {
$title = pht('Cancel Event');
if ($is_recurring) {
$body = pht(
'This event is part of a series. Which events do you want to '.
'cancel?');
$show_control = true;
} else {
$body = pht('Cancel this event?');
$show_control = false;
}
$submit = pht('Cancel Event');
}
$dialog = $this->newDialog()
->setTitle($title)
->setValidationException($validation_exception)
->appendParagraph($body)
->addCancelButton($cancel_uri, pht('Back'))
->addSubmitButton($submit);
if ($show_control) {
+ $start_time = phutil_tag(
+ 'strong',
+ array(),
+ phabricator_datetime($event->getStartDateTimeEpoch(), $viewer));
+
+ if ($is_cancelled) {
+ $this_name = pht('Reinstate Only This Event');
+ $this_caption = pht(
+ 'Reinstate only the event which occurs on %s.',
+ $start_time);
+
+ $future_name = pht('Reinstate This And All Later Events');
+ $future_caption = pht(
+ 'Reinstate this event and all events in the series which occur '.
+ 'on or after %s.',
+ $start_time);
+ } else {
+ $this_name = pht('Cancel Only This Event');
+ $this_caption = pht(
+ 'Cancel only the event which occurs on %s.',
+ $start_time);
+
+ $future_name = pht('Cancel This And All Later Events');
+ $future_caption = pht(
+ 'Cancel this event and all events in the series which occur '.
+ 'on or after %s.',
+ $start_time);
+ }
+
+
$form = id(new AphrontFormView())
->setViewer($viewer)
->appendControl(
- id(new AphrontFormSelectControl())
- ->setLabel(pht('Cancel Events'))
+ id(new AphrontFormRadioButtonControl())
->setName('mode')
- ->setOptions(
- array(
- 'this' => pht('Only This Event'),
- 'future' => pht('All Future Events'),
- )));
- $dialog->appendForm($form);
+ ->setValue(PhabricatorCalendarEventEditEngine::MODE_THIS)
+ ->addButton(
+ PhabricatorCalendarEventEditEngine::MODE_THIS,
+ $this_name,
+ $this_caption)
+ ->addButton(
+ PhabricatorCalendarEventEditEngine::MODE_FUTURE,
+ $future_name,
+ $future_caption));
+
+ $dialog
+ ->setWidth(AphrontDialogView::WIDTH_FORM)
+ ->appendForm($form);
}
return $dialog;
}
}
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
index 928526f33f..431c1ea71d 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -1,84 +1,96 @@
<?php
final class PhabricatorCalendarEventEditController
extends PhabricatorCalendarController {
public function handleRequest(AphrontRequest $request) {
$viewer = $this->getViewer();
$engine = id(new PhabricatorCalendarEventEditEngine())
->setController($this);
$id = $request->getURIData('id');
if ($id) {
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($viewer)
->withIDs(array($id))
->executeOne();
$response = $this->newImportedEventResponse($event);
if ($response) {
return $response;
}
$cancel_uri = $event->getURI();
$page = $request->getURIData('pageKey');
if ($page == 'recurring') {
if ($event->isChildEvent()) {
return $this->newDialog()
->setTitle(pht('Series Event'))
->appendParagraph(
pht(
'This event is an instance in an event series. To change '.
'the behavior for the series, edit the parent event.'))
->addCancelButton($cancel_uri);
}
} else if ($event->getIsRecurring()) {
// If the user submits a comment or makes an edit via comment actions,
// always target only the current event. It doesn't make sense to add
// comments to every instance of an event, and the other actions don't
// make much sense to apply to all instances either.
if ($engine->isCommentAction()) {
$mode = PhabricatorCalendarEventEditEngine::MODE_THIS;
} else {
$mode = $request->getStr('mode');
}
if (!$mode) {
+ $start_time = phutil_tag(
+ 'strong',
+ array(),
+ phabricator_datetime($event->getStartDateTimeEpoch(), $viewer));
+
$form = id(new AphrontFormView())
->setViewer($viewer)
->appendControl(
- id(new AphrontFormSelectControl())
- ->setLabel(pht('Edit Events'))
+ id(new AphrontFormRadioButtonControl())
->setName('mode')
- ->setOptions(
- array(
- PhabricatorCalendarEventEditEngine::MODE_THIS
- => pht('Edit Only This Event'),
- PhabricatorCalendarEventEditEngine::MODE_FUTURE
- => pht('Edit All Future Events'),
- )));
-
+ ->setValue(PhabricatorCalendarEventEditEngine::MODE_THIS)
+ ->addButton(
+ PhabricatorCalendarEventEditEngine::MODE_THIS,
+ pht('Edit Only This Event'),
+ pht(
+ 'Edit only the event which occurs at %s.',
+ $start_time))
+ ->addButton(
+ PhabricatorCalendarEventEditEngine::MODE_FUTURE,
+ pht('Edit This And All Later Events'),
+ pht(
+ 'Edit this event and all events in the series which '.
+ 'occur on or after %s. This will overwrite previous '.
+ 'edits!',
+ $start_time)));
return $this->newDialog()
->setTitle(pht('Edit Event'))
+ ->setWidth(AphrontDialogView::WIDTH_FORM)
->appendParagraph(
pht(
'This event is part of a series. Which events do you '.
'want to edit?'))
->appendForm($form)
->addSubmitButton(pht('Continue'))
->addCancelButton($cancel_uri)
->setDisableWorkflowOnSubmit(true);
}
$engine
->addContextParameter('mode', $mode)
->setSeriesEditMode($mode);
}
}
return $engine->buildResponse();
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 1, 2:08 PM (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
430573
Default Alt Text
(10 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)