Page MenuHomePhabricator
Files F15478215

D12643.id30364.diff
No OneTemporary
Actions

D12643.id30364.diff
View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -77,6 +77,15 @@
}
$errors = array();
+ $name = $event->getName();
+ $description = $event->getDescription();
+ $type = $event->getStatus();
+
+ $current_policies = id(new PhabricatorPolicyQuery())
+ ->setViewer($user)
+ ->setObject($event)
+ ->execute();
+
if ($request->isFormPost()) {
$xactions = array();
$name = $request->getStr('name');
@@ -85,6 +94,8 @@
$end_value = $end_time->readValueFromRequest($request);
$description = $request->getStr('description');
$subscribers = $request->getArr('subscribers');
+ $edit_policy = $request->getStr('editPolicy');
+ $view_policy = $request->getStr('viewPolicy');
$invitees = $request->getArr('invitees');
$new_invitees = $this->getNewInviteeList($invitees, $event);
@@ -159,7 +170,13 @@
$validation_exception = $ex;
$error_name = $ex
->getShortMessage(PhabricatorCalendarEventTransaction::TYPE_NAME);
+
+ $event->setViewPolicy($view_policy);
+ $event->setEditPolicy($edit_policy);
}
+ } else {
+ $event->setViewPolicy($view_policy);
+ $event->setEditPolicy($edit_policy);
}
}
@@ -173,24 +190,20 @@
$name = id(new AphrontFormTextControl())
->setLabel(pht('Name'))
->setName('name')
- ->setValue($event->getName())
+ ->setValue($name)
->setError($error_name);
$status_select = id(new AphrontFormSelectControl())
->setLabel(pht('Status'))
->setName('status')
- ->setValue($event->getStatus())
+ ->setValue($type)
->setOptions($event->getStatusOptions());
$description = id(new AphrontFormTextAreaControl())
->setLabel(pht('Description'))
->setName('description')
- ->setValue($event->getDescription());
+ ->setValue($description);
- $current_policies = id(new PhabricatorPolicyQuery())
- ->setViewer($user)
- ->setObject($event)
- ->execute();
$view_policies = id(new AphrontFormPolicyControl())
->setUser($user)
->setCapability(PhabricatorPolicyCapability::CAN_VIEW)

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 8, 9:08 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7427505
Default Alt Text
D12643.id30364.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility