No OneTemporary
Actions

Size

48 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
	index cb87cd7373..8cbd594bea 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
	@@ -1,129 +1,129 @@
	<?php

	final class PhabricatorCalendarEventCancelController
	extends PhabricatorCalendarController {

	private $id;

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	$sequence = $request->getURIData('sequence');

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();

	if ($sequence) {
	$parent_event = $event;
	$event = $parent_event->generateNthGhost($sequence, $user);
	$event->attachParentEvent($parent_event);
	}

	if (!$event) {
	return new Aphront404Response();
	}

	if (!$sequence) {
	$cancel_uri = '/E'.$event->getID();
	} else {
	$cancel_uri = '/E'.$event->getID().'/'.$sequence;
	}

	$is_cancelled = $event->getIsCancelled();
	$is_parent_cancelled = $event->getIsParentCancelled();
	$is_parent = $event->getIsRecurrenceParent();

	$validation_exception = null;

	if ($request->isFormPost()) {
	if ($is_cancelled && $sequence) {
	return id(new AphrontRedirectResponse())->setURI($cancel_uri);
	} else if ($sequence) {
	$event = $this->createEventFromGhost(
	$user,
	$event,
	$sequence);
	$event->applyViewerTimezone($user);
	}

	$xactions = array();

	$xaction = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_CANCEL)
	->setNewValue(!$is_cancelled);

	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($user)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true);

	try {
	$editor->applyTransactions($event, array($xaction));
	return id(new AphrontRedirectResponse())->setURI($cancel_uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	}
	}

	if ($is_cancelled) {
	if ($sequence \|\| $is_parent_cancelled) {
	$title = pht('Cannot Reinstate Instance');
	- $paragraph = pht('Cannot reinstate an instance of a ' .
	- 'cancelled recurring event.');
	+ $paragraph = pht(
	+ 'Cannot reinstate an instance of a cancelled recurring event.');
	$cancel = pht('Cancel');
	$submit = null;
	} else if ($is_parent) {
	$title = pht('Reinstate Recurrence');
	- $paragraph = pht('Reinstate the entire series ' .
	- 'of recurring events?');
	- $cancel = pht('Don\'t Reinstate Recurrence');
	+ $paragraph = pht(
	+ 'Reinstate the entire series of recurring events?');
	+ $cancel = pht("Don't Reinstate Recurrence");
	$submit = pht('Reinstate Recurrence');
	} else {
	$title = pht('Reinstate Event');
	$paragraph = pht('Reinstate this event?');
	- $cancel = pht('Don\'t Reinstate Event');
	+ $cancel = pht("Don't Reinstate Event");
	$submit = pht('Reinstate Event');
	}
	} else {
	if ($sequence) {
	$title = pht('Cancel Instance');
	- $paragraph = pht('Cancel just this instance ' .
	- 'of a recurring event.');
	- $cancel = pht('Don\'t Cancel Instance');
	+ $paragraph = pht(
	+ 'Cancel just this instance of a recurring event.');
	+ $cancel = pht("Don't Cancel Instance");
	$submit = pht('Cancel Instance');
	} else if ($is_parent) {
	$title = pht('Cancel Recurrence');
	- $paragraph = pht('Cancel the entire series ' .
	- 'of recurring events?');
	- $cancel = pht('Don\'t Cancel Recurrence');
	+ $paragraph = pht(
	+ 'Cancel the entire series of recurring events?');
	+ $cancel = pht("Don't Cancel Recurrence");
	$submit = pht('Cancel Recurrence');
	} else {
	$title = pht('Cancel Event');
	- $paragraph = pht('You can always reinstate ' .
	- 'the event later.');
	- $cancel = pht('Don\'t Cancel Event');
	+ $paragraph = pht(
	+ 'You can always reinstate the event later.');
	+ $cancel = pht("Don't Cancel Event");
	$submit = pht('Cancel Event');
	}
	}

	return $this->newDialog()
	->setTitle($title)
	->setValidationException($validation_exception)
	->appendParagraph($paragraph)
	->addCancelButton($cancel_uri, $cancel)
	->addSubmitButton($submit);
	}
	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
	index a735ee5caa..9094de5401 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
	@@ -1,86 +1,85 @@
	<?php

	final class PhabricatorCalendarEventCommentController
	extends PhabricatorCalendarController {

	private $id;

	-
	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function handleRequest(AphrontRequest $request) {
	if (!$request->isFormPost()) {
	return new Aphront400Response();
	}

	$user = $request->getUser();
	$is_preview = $request->isPreviewRequest();
	$draft = PhabricatorDraft::buildFromRequest($request);

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	->executeOne();
	if (!$event) {
	return new Aphront404Response();
	}

	$index = $request->getURIData('sequence');
	if ($index && !$is_preview) {
	$result = $this->getEventAtIndexForGhostPHID(
	$user,
	$event->getPHID(),
	$index);

	if ($result) {
	$event = $result;
	} else {
	$event = $this->createEventFromGhost(
	$user,
	$event,
	$index);
	$event->applyViewerTimezone($user);
	}
	}

	$view_uri = '/'.$event->getMonogram();

	$xactions = array();
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new PhabricatorCalendarEventTransactionComment())
	->setContent($request->getStr('comment')));

	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($user)
	->setContinueOnNoEffect($request->isContinueRequest())
	->setContentSourceFromRequest($request)
	->setIsPreview($is_preview);

	try {
	$xactions = $editor->applyTransactions($event, $xactions);
	} catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	return id(new PhabricatorApplicationTransactionNoEffectResponse())
	->setCancelURI($view_uri)
	->setException($ex);
	}

	if ($draft) {
	$draft->replaceOrDelete();
	}

	if ($request->isAjax() && $is_preview) {
	return id(new PhabricatorApplicationTransactionResponse())
	->setViewer($user)
	->setTransactions($xactions)
	->setIsPreview($is_preview);
	} else {
	return id(new AphrontRedirectResponse())
	->setURI($view_uri);
	}
	}

	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php b/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
	index 7b813cdc44..6f88aae0c7 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
	@@ -1,66 +1,64 @@
	<?php

	final class PhabricatorCalendarEventDragController
	extends PhabricatorCalendarController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$event) {
	return new Aphront404Response();
	}

	if (!$request->validateCSRF()) {
	return new Aphront400Response();
	}

	if ($event->getIsAllDay()) {
	return new Aphront400Response();
	}

	$xactions = array();

	$duration = $event->getDateTo() - $event->getDateFrom();

	$start = $request->getInt('start');
	$start_value = id(AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$start));

	$end = $start + $duration;
	$end_value = id(AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$end));


	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	- ->setTransactionType(
	- PhabricatorCalendarEventTransaction::TYPE_START_DATE)
	+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_START_DATE)
	->setNewValue($start_value);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	- ->setTransactionType(
	- PhabricatorCalendarEventTransaction::TYPE_END_DATE)
	+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_END_DATE)
	->setNewValue($end_value);


	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($viewer)
	->setContinueOnMissingFields(true)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	$xactions = $editor->applyTransactions($event, $xactions);

	return id(new AphrontReloadResponse());
	}
	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	index 0b05d14987..07da53fa67 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	@@ -1,637 +1,637 @@
	<?php

	final class PhabricatorCalendarEventEditController
	extends PhabricatorCalendarController {

	private $id;

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function isCreate() {
	return !$this->id;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$user_phid = $viewer->getPHID();
	$error_name = true;
	$error_recurrence_end_date = null;
	$error_start_date = true;
	$error_end_date = true;
	$validation_exception = null;

	$is_recurring_id = celerity_generate_unique_node_id();
	$recurrence_end_date_id = celerity_generate_unique_node_id();
	$frequency_id = celerity_generate_unique_node_id();
	$all_day_id = celerity_generate_unique_node_id();
	$start_date_id = celerity_generate_unique_node_id();
	$end_date_id = celerity_generate_unique_node_id();

	$next_workflow = $request->getStr('next');
	$uri_query = $request->getStr('query');

	if ($this->isCreate()) {
	$mode = $request->getStr('mode');
	$event = PhabricatorCalendarEvent::initializeNewCalendarEvent(
	$viewer,
	$mode);

	$create_start_year = $request->getInt('year');
	$create_start_month = $request->getInt('month');
	$create_start_day = $request->getInt('day');
	$create_start_time = $request->getStr('time');

	if ($create_start_year) {
	$start = AphrontFormDateControlValue::newFromParts(
	$viewer,
	$create_start_year,
	$create_start_month,
	$create_start_day,
	$create_start_time);
	if (!$start->isValid()) {
	return new Aphront400Response();
	}
	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$start->getEpoch());

	$end = clone $start_value->getDateTime();
	$end->modify('+1 hour');
	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$end->format('U'));

	} else {
	list($start_value, $end_value) = $this->getDefaultTimeValues($viewer);
	}

	$recurrence_end_date_value = clone $end_value;
	$recurrence_end_date_value->setOptional(true);

	$submit_label = pht('Create');
	$page_title = pht('Create Event');
	$redirect = 'created';
	$subscribers = array();
	$invitees = array($user_phid);
	$cancel_uri = $this->getApplicationURI();
	} else {
	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();

	if (!$event) {
	return new Aphront404Response();
	}

	if ($request->getURIData('sequence')) {
	$index = $request->getURIData('sequence');

	$result = $this->getEventAtIndexForGhostPHID(
	$viewer,
	$event->getPHID(),
	$index);

	if ($result) {
	return id(new AphrontRedirectResponse())
	->setURI('/calendar/event/edit/'.$result->getID().'/');
	}

	$event = $this->createEventFromGhost(
	$viewer,
	$event,
	$index);

	return id(new AphrontRedirectResponse())
	->setURI('/calendar/event/edit/'.$event->getID().'/');
	}

	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$event->getDateTo());
	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$event->getDateFrom());
	$recurrence_end_date_value = id(clone $end_value)
	->setOptional(true);

	$submit_label = pht('Update');
	$page_title = pht('Update Event');

	$subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$event->getPHID());

	$invitees = array();
	foreach ($event->getInvitees() as $invitee) {
	if ($invitee->isUninvited()) {
	continue;
	} else {
	$invitees[] = $invitee->getInviteePHID();
	}
	}

	$cancel_uri = '/'.$event->getMonogram();
	}

	if ($this->isCreate()) {
	$projects = array();
	} else {
	$projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$event->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$projects = array_reverse($projects);
	}

	$name = $event->getName();
	$description = $event->getDescription();
	$is_all_day = $event->getIsAllDay();
	$is_recurring = $event->getIsRecurring();
	$is_parent = $event->getIsRecurrenceParent();
	$frequency = idx($event->getRecurrenceFrequency(), 'rule');
	$icon = $event->getIcon();
	$edit_policy = $event->getEditPolicy();
	$view_policy = $event->getViewPolicy();
	$space = $event->getSpacePHID();

	if ($request->isFormPost()) {
	$xactions = array();
	$name = $request->getStr('name');

	$start_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'start');
	$end_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'end');
	$recurrence_end_date_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'recurrenceEndDate');
	$recurrence_end_date_value->setOptional(true);
	$projects = $request->getArr('projects');
	$description = $request->getStr('description');
	$subscribers = $request->getArr('subscribers');
	$edit_policy = $request->getStr('editPolicy');
	$view_policy = $request->getStr('viewPolicy');
	$space = $request->getStr('spacePHID');
	$is_recurring = $request->getStr('isRecurring') ? 1 : 0;
	$frequency = $request->getStr('frequency');
	$is_all_day = $request->getStr('isAllDay');
	$icon = $request->getStr('icon');

	$invitees = $request->getArr('invitees');
	$new_invitees = $this->getNewInviteeList($invitees, $event);
	$status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
	if ($this->isCreate()) {
	$status = idx($new_invitees, $viewer->getPHID());
	if ($status) {
	$new_invitees[$viewer->getPHID()] = $status_attending;
	}
	}

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_NAME)
	->setNewValue($name);

	if ($is_recurring && $this->isCreate()) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_RECURRING)
	->setNewValue($is_recurring);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_FREQUENCY)
	->setNewValue(array('rule' => $frequency));

	if (!$recurrence_end_date_value->isDisabled()) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE)
	->setNewValue($recurrence_end_date_value);
	}
	}

	if (($is_recurring && $this->isCreate()) \|\| !$is_parent) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_ALL_DAY)
	->setNewValue($is_all_day);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_ICON)
	->setNewValue($icon);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_START_DATE)
	->setNewValue($start_value);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_END_DATE)
	->setNewValue($end_value);
	}


	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue(array('=' => array_fuse($subscribers)));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_INVITE)
	->setNewValue($new_invitees);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_DESCRIPTION)
	->setNewValue($description);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($request->getStr('viewPolicy'));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	->setNewValue($request->getStr('editPolicy'));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SPACE)
	->setNewValue($space);

	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	try {
	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($projects)));

	$xactions = $editor->applyTransactions($event, $xactions);
	$response = id(new AphrontRedirectResponse());
	switch ($next_workflow) {
	case 'day':
	if (!$uri_query) {
	$uri_query = 'month';
	}
	$year = $start_value->getDateTime()->format('Y');
	$month = $start_value->getDateTime()->format('m');
	$day = $start_value->getDateTime()->format('d');
	$response->setURI(
	'/calendar/query/'.$uri_query.'/'.$year.'/'.$month.'/'.$day.'/');
	break;
	default:
	$response->setURI('/E'.$event->getID());
	break;
	}
	return $response;
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	$error_name = $ex->getShortMessage(
	- PhabricatorCalendarEventTransaction::TYPE_NAME);
	+ PhabricatorCalendarEventTransaction::TYPE_NAME);
	$error_start_date = $ex->getShortMessage(
	- PhabricatorCalendarEventTransaction::TYPE_START_DATE);
	+ PhabricatorCalendarEventTransaction::TYPE_START_DATE);
	$error_end_date = $ex->getShortMessage(
	- PhabricatorCalendarEventTransaction::TYPE_END_DATE);
	+ PhabricatorCalendarEventTransaction::TYPE_END_DATE);
	$error_recurrence_end_date = $ex->getShortMessage(
	- PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
	+ PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
	}
	}

	$is_recurring_checkbox = null;
	$recurrence_end_date_control = null;
	$recurrence_frequency_select = null;

	$all_day_checkbox = null;
	$start_control = null;
	$end_control = null;

	$recurring_date_edit_label = null;

	$current_policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($event)
	->execute();

	$name = id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($name)
	->setError($error_name);

	if ($this->isCreate()) {
	Javelin::initBehavior('recurring-edit', array(
	'isRecurring' => $is_recurring_id,
	'frequency' => $frequency_id,
	'recurrenceEndDate' => $recurrence_end_date_id,
	));

	$is_recurring_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isRecurring',
	1,
	pht('Recurring Event'),
	$is_recurring,
	$is_recurring_id);

	$recurrence_end_date_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('recurrenceEndDate')
	->setLabel(pht('Recurrence End Date'))
	->setError($error_recurrence_end_date)
	->setValue($recurrence_end_date_value)
	->setID($recurrence_end_date_id)
	->setIsTimeDisabled(true)
	->setIsDisabled($recurrence_end_date_value->isDisabled())
	->setAllowNull(true);

	$recurrence_frequency_select = id(new AphrontFormSelectControl())
	->setName('frequency')
	->setOptions(array(
	PhabricatorCalendarEvent::FREQUENCY_DAILY => pht('Daily'),
	PhabricatorCalendarEvent::FREQUENCY_WEEKLY => pht('Weekly'),
	PhabricatorCalendarEvent::FREQUENCY_MONTHLY => pht('Monthly'),
	PhabricatorCalendarEvent::FREQUENCY_YEARLY => pht('Yearly'),
	))
	->setValue($frequency)
	->setLabel(pht('Recurring Event Frequency'))
	->setID($frequency_id)
	->setDisabled(!$is_recurring);
	}

	if ($this->isCreate() \|\| (!$is_parent && !$this->isCreate())) {
	Javelin::initBehavior('event-all-day', array(
	'allDayID' => $all_day_id,
	'startDateID' => $start_date_id,
	'endDateID' => $end_date_id,
	));

	$all_day_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isAllDay',
	1,
	pht('All Day Event'),
	$is_all_day,
	$all_day_id);

	$start_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('start')
	->setLabel(pht('Start'))
	->setError($error_start_date)
	->setValue($start_value)
	->setID($start_date_id)
	->setIsTimeDisabled($is_all_day)
	->setEndDateID($end_date_id);

	$end_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('end')
	->setLabel(pht('End'))
	->setError($error_end_date)
	->setValue($end_value)
	->setID($end_date_id)
	->setIsTimeDisabled($is_all_day);
	} else if ($is_parent) {
	$recurring_date_edit_label = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setValue(pht('Date and time of recurring event cannot be edited.'));

	if (!$recurrence_end_date_value->isDisabled()) {
	$disabled_recurrence_end_date_value =
	$recurrence_end_date_value->getValueAsFormat('M d, Y');
	$recurrence_end_date_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('Recurrence End Date'))
	->setValue($disabled_recurrence_end_date_value)
	->setDisabled(true);
	}

	$recurrence_frequency_select = id(new AphrontFormSelectControl())
	->setName('frequency')
	->setOptions(array(
	- 'daily' => pht('Daily'),
	- 'weekly' => pht('Weekly'),
	- 'monthly' => pht('Monthly'),
	- 'yearly' => pht('Yearly'),
	- ))
	+ 'daily' => pht('Daily'),
	+ 'weekly' => pht('Weekly'),
	+ 'monthly' => pht('Monthly'),
	+ 'yearly' => pht('Yearly'),
	+ ))
	->setValue($frequency)
	->setLabel(pht('Recurring Event Frequency'))
	->setID($frequency_id)
	->setDisabled(true);

	$all_day_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isAllDay',
	1,
	pht('All Day Event'),
	$is_all_day,
	$all_day_id)
	->setDisabled(true);

	$start_disabled = $start_value->getValueAsFormat('M d, Y, g:i A');
	$end_disabled = $end_value->getValueAsFormat('M d, Y, g:i A');

	$start_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('Start'))
	->setValue($start_disabled)
	->setDisabled(true);

	$end_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('End'))
	->setValue($end_disabled);
	}

	$projects = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($projects)
	->setUser($viewer)
	->setDatasource(new PhabricatorProjectDatasource());

	$description = id(new PhabricatorRemarkupControl())
	->setLabel(pht('Description'))
	->setName('description')
	->setValue($description)
	->setUser($viewer);

	$view_policies = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setValue($view_policy)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($event)
	->setPolicies($current_policies)
	->setSpacePHID($space)
	->setName('viewPolicy');
	$edit_policies = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setValue($edit_policy)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($event)
	->setPolicies($current_policies)
	->setName('editPolicy');

	$subscribers = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('subscribers')
	->setValue($subscribers)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource());

	$invitees = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Invitees'))
	->setName('invitees')
	->setValue($invitees)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource());

	if ($this->isCreate()) {
	$icon_uri = $this->getApplicationURI('icon/');
	} else {
	$icon_uri = $this->getApplicationURI('icon/'.$event->getID().'/');
	}
	$icon_display = PhabricatorCalendarIcon::renderIconForChooser($icon);
	$icon = id(new AphrontFormChooseButtonControl())
	->setLabel(pht('Icon'))
	->setName('icon')
	->setDisplayValue($icon_display)
	->setButtonText(pht('Choose Icon...'))
	->setChooseURI($icon_uri)
	->setValue($icon);

	$form = id(new AphrontFormView())
	->addHiddenInput('next', $next_workflow)
	->addHiddenInput('query', $uri_query)
	->setUser($viewer)
	->appendChild($name);

	if ($recurring_date_edit_label) {
	$form->appendControl($recurring_date_edit_label);
	}
	if ($is_recurring_checkbox) {
	$form->appendChild($is_recurring_checkbox);
	}
	if ($recurrence_end_date_control) {
	$form->appendChild($recurrence_end_date_control);
	}
	if ($recurrence_frequency_select) {
	$form->appendControl($recurrence_frequency_select);
	}

	$form
	->appendChild($all_day_checkbox)
	->appendChild($start_control)
	->appendChild($end_control)
	->appendControl($view_policies)
	->appendControl($edit_policies)
	->appendControl($subscribers)
	->appendControl($invitees)
	->appendChild($projects)
	->appendChild($description)
	->appendChild($icon);


	if ($request->isAjax()) {
	return $this->newDialog()
	->setTitle($page_title)
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->appendForm($form)
	->addCancelButton($cancel_uri)
	->addSubmitButton($submit_label);
	}

	$submit = id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($submit_label);

	$form->appendChild($submit);

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($page_title)
	->setForm($form);

	$crumbs = $this->buildApplicationCrumbs();

	if (!$this->isCreate()) {
	$crumbs->addTextCrumb('E'.$event->getId(), '/E'.$event->getId());
	}

	$crumbs->addTextCrumb($page_title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeaderText($page_title)
	->setValidationException($validation_exception)
	->appendChild($form);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	- ),
	+ ),
	array(
	'title' => $page_title,
	));
	}


	public function getNewInviteeList(array $phids, $event) {
	$invitees = $event->getInvitees();
	$invitees = mpull($invitees, null, 'getInviteePHID');
	$invited_status = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$uninvited_status = PhabricatorCalendarEventInvitee::STATUS_UNINVITED;
	$phids = array_fuse($phids);

	$new = array();
	foreach ($phids as $phid) {
	$old_status = $event->getUserInviteStatus($phid);
	if ($old_status != $uninvited_status) {
	continue;
	}
	$new[$phid] = $invited_status;
	}

	foreach ($invitees as $invitee) {
	$deleted_invitee = !idx($phids, $invitee->getInviteePHID());
	if ($deleted_invitee) {
	$new[$invitee->getInviteePHID()] = $uninvited_status;
	}
	}

	return $new;
	}

	private function getDefaultTimeValues($viewer) {
	$start = new DateTime('@'.time());
	$start->setTimeZone($viewer->getTimeZone());

	$start->setTime($start->format('H'), 0, 0);
	$start->modify('+1 hour');
	$end = id(clone $start)->modify('+1 hour');

	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$start->format('U'));
	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$end->format('U'));

	return array($start_value, $end_value);
	}

	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php b/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
	index a77856f16a..60cde4f561 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
	@@ -1,93 +1,92 @@
	<?php

	final class PhabricatorCalendarEventJoinController
	extends PhabricatorCalendarController {

	private $id;

	const ACTION_ACCEPT = 'accept';
	const ACTION_DECLINE = 'decline';
	const ACTION_JOIN = 'join';

	public function handleRequest(AphrontRequest $request) {
	$this->id = $request->getURIData('id');
	$action = $request->getURIData('action');

	$request = $this->getRequest();
	$viewer = $request->getViewer();
	$declined_status = PhabricatorCalendarEventInvitee::STATUS_DECLINED;
	$attending_status = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();

	if (!$event) {
	return new Aphront404Response();
	}

	$cancel_uri = '/E'.$event->getID();
	$validation_exception = null;

	$is_attending = $event->getIsUserAttending($viewer->getPHID());

	if ($request->isFormPost()) {
	$new_status = null;

	switch ($action) {
	case self::ACTION_ACCEPT:
	$new_status = $attending_status;
	break;
	case self::ACTION_JOIN:
	if ($is_attending) {
	$new_status = $declined_status;
	} else {
	$new_status = $attending_status;
	}
	break;
	case self::ACTION_DECLINE:
	$new_status = $declined_status;
	break;
	}

	$new_status = array($viewer->getPHID() => $new_status);

	$xaction = id(new PhabricatorCalendarEventTransaction())
	- ->setTransactionType(
	- PhabricatorCalendarEventTransaction::TYPE_INVITE)
	+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_INVITE)
	->setNewValue($new_status);

	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true);

	try {
	$editor->applyTransactions($event, array($xaction));
	return id(new AphrontRedirectResponse())->setURI($cancel_uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	}
	}

	if (($action == self::ACTION_JOIN && !$is_attending)
	\|\| $action == self::ACTION_ACCEPT) {
	$title = pht('Join Event');
	$paragraph = pht('Would you like to join this event?');
	$submit = pht('Join');
	} else {
	$title = pht('Decline Event');
	$paragraph = pht('Would you like to decline this event?');
	$submit = pht('Decline');
	}

	return $this->newDialog()
	->setTitle($title)
	->setValidationException($validation_exception)
	->appendParagraph($paragraph)
	->addCancelButton($cancel_uri)
	->addSubmitButton($submit);
	}
	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	index dcc717d474..0685bbe637 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	@@ -1,391 +1,390 @@
	<?php

	final class PhabricatorCalendarEventViewController
	extends PhabricatorCalendarController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = $data['id'];
	}

	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	$sequence = $request->getURIData('sequence');

	$timeline = null;

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if (!$event) {
	return new Aphront404Response();
	}

	if ($sequence) {
	$result = $this->getEventAtIndexForGhostPHID(
	$viewer,
	$event->getPHID(),
	$sequence);

	if ($result) {
	$parent_event = $event;
	$event = $result;
	$event->attachParentEvent($parent_event);
	return id(new AphrontRedirectResponse())
	->setURI('/E'.$result->getID());
	} else if ($sequence && $event->getIsRecurring()) {
	$parent_event = $event;
	$event = $event->generateNthGhost($sequence, $viewer);
	$event->attachParentEvent($parent_event);
	} else if ($sequence) {
	return new Aphront404Response();
	}

	$title = $event->getMonogram().' ('.$sequence.')';
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/'.$event->getMonogram().'/'.$sequence);


	} else {
	$title = 'E'.$event->getID();
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/E'.$event->getID());
	}

	if (!$event->getIsGhostEvent()) {
	$timeline = $this->buildTransactionTimeline(
	$event,
	new PhabricatorCalendarEventTransactionQuery());
	}

	$header = $this->buildHeaderView($event);
	$actions = $this->buildActionView($event);
	$properties = $this->buildPropertyView($event);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Add To Plate');
	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
	if ($sequence) {
	$comment_uri = $this->getApplicationURI(
	- '/event/comment/'.$event->getID().'/'.$sequence.'/');
	+ '/event/comment/'.$event->getID().'/'.$sequence.'/');
	} else {
	$comment_uri = $this->getApplicationURI(
	- '/event/comment/'.$event->getID().'/');
	+ '/event/comment/'.$event->getID().'/');
	}
	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($event->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($comment_uri)
	->setSubmitButtonName(pht('Add Comment'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $page_title,
	));
	}

	private function buildHeaderView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();

	$is_cancelled = $event->getIsCancelled();
	$icon = $is_cancelled ? ('fa-times') : ('fa-calendar');
	$color = $is_cancelled ? ('grey') : ('green');
	$status = $is_cancelled ? pht('Cancelled') : pht('Active');

	$invite_status = $event->getUserInviteStatus($viewer->getPHID());
	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$is_invite_pending = ($invite_status == $status_invited);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($event->getName())
	->setStatus($icon, $color, $status)
	->setPolicyObject($event);

	if ($is_invite_pending) {
	$decline_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-times grey'))
	->setHref($this->getApplicationURI("/event/decline/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Decline'));

	$accept_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-check green'))
	->setHref($this->getApplicationURI("/event/accept/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Accept'));

	$header->addActionLink($decline_button)
	->addActionLink($accept_button);
	}
	return $header;
	}

	private function buildActionView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();
	$is_cancelled = $event->getIsCancelled();
	$is_attending = $event->getIsUserAttending($viewer->getPHID());

	$actions = id(new PhabricatorActionListView())
	->setObjectURI($this->getApplicationURI('event/'.$id.'/'))
	->setUser($viewer)
	->setObject($event);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$event,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_label = false;
	$edit_uri = false;

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/{$index}/";
	} else if ($event->getIsRecurrenceException()) {
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/";
	} else {
	$edit_label = pht('Edit');
	$edit_uri = "event/edit/{$id}/";
	}

	if ($edit_label && $edit_uri) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($edit_label)
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI($edit_uri))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));
	}

	if ($is_attending) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Decline Event'))
	->setIcon('fa-user-times')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Join Event'))
	->setIcon('fa-user-plus')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	}

	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/");

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$can_reinstate = $event->getIsParentCancelled();

	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/{$index}/");
	} else if ($event->getIsRecurrenceException()) {
	$can_reinstate = $event->getIsParentCancelled();
	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	} else if ($event->getIsRecurrenceParent()) {
	$cancel_label = pht('Cancel Recurrence');
	$reinstate_label = pht('Reinstate Recurrence');
	$cancel_disabled = !$can_edit;
	} else {
	$cancel_label = pht('Cancel Event');
	$reinstate_label = pht('Reinstate Event');
	$cancel_disabled = !$can_edit;
	}

	if ($is_cancelled) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($reinstate_label)
	->setIcon('fa-plus')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($cancel_label)
	->setIcon('fa-times')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	}

	return $actions;
	}

	private function buildPropertyView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($event);

	if ($event->getIsAllDay()) {
	$date_start = phabricator_date($event->getDateFrom(), $viewer);
	$date_end = phabricator_date($event->getDateTo(), $viewer);

	if ($date_start == $date_end) {
	$properties->addProperty(
	pht('Time'),
	phabricator_date($event->getDateFrom(), $viewer));
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_date($event->getDateFrom(), $viewer));
	$properties->addProperty(
	pht('Ends'),
	phabricator_date($event->getDateTo(), $viewer));
	}
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_datetime($event->getDateFrom(), $viewer));

	$properties->addProperty(
	pht('Ends'),
	phabricator_datetime($event->getDateTo(), $viewer));
	}

	if ($event->getIsRecurring()) {
	$properties->addProperty(
	pht('Recurs'),
	ucwords(idx($event->getRecurrenceFrequency(), 'rule')));

	if ($event->getRecurrenceEndDate()) {
	$properties->addProperty(
	pht('Recurrence Ends'),
	phabricator_datetime($event->getRecurrenceEndDate(), $viewer));
	}

	if ($event->getInstanceOfEventPHID()) {
	$properties->addProperty(
	pht('Recurrence of Event'),
	pht('%s of %s',
	$event->getSequenceIndex(),
	$viewer->renderHandle($event->getInstanceOfEventPHID())->render()));
	}
	}

	$properties->addProperty(
	pht('Host'),
	$viewer->renderHandle($event->getUserPHID()));

	$invitees = $event->getInvitees();
	foreach ($invitees as $key => $invitee) {
	if ($invitee->isUninvited()) {
	unset($invitees[$key]);
	}
	}

	if ($invitees) {
	$invitee_list = new PHUIStatusListView();

	$icon_invited = PHUIStatusItemView::ICON_OPEN;
	$icon_attending = PHUIStatusItemView::ICON_ACCEPT;
	$icon_declined = PHUIStatusItemView::ICON_REJECT;

	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
	$status_declined = PhabricatorCalendarEventInvitee::STATUS_DECLINED;

	$icon_map = array(
	$status_invited => $icon_invited,
	$status_attending => $icon_attending,
	$status_declined => $icon_declined,
	);

	$icon_color_map = array(
	$status_invited => null,
	$status_attending => 'green',
	$status_declined => 'red',
	);

	foreach ($invitees as $invitee) {
	$item = new PHUIStatusItemView();
	$invitee_phid = $invitee->getInviteePHID();
	$status = $invitee->getStatus();
	$target = $viewer->renderHandle($invitee_phid);
	$icon = $icon_map[$status];
	$icon_color = $icon_color_map[$status];

	$item->setIcon($icon, $icon_color)
	->setTarget($target);
	$invitee_list->addItem($item);
	}
	} else {
	$invitee_list = phutil_tag(
	'em',
	array(),
	pht('None'));
	}

	$properties->addProperty(
	pht('Invitees'),
	$invitee_list);

	$properties->invokeWillRenderEvent();

	$icon_display = PhabricatorCalendarIcon::renderIconForChooser(
	$event->getIcon());
	$properties->addProperty(
	pht('Icon'),
	$icon_display);

	if (strlen($event->getDescription())) {
	-
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addTextContent($description);
	}

	return $properties;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 20:35 (6 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1128488
Default Alt Text: (48 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions