Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13958921
D16681.id40160.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D16681.id40160.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2076,6 +2076,7 @@
'PhabricatorCalendarEventUntilDateTransaction' => 'applications/calendar/xaction/PhabricatorCalendarEventUntilDateTransaction.php',
'PhabricatorCalendarEventViewController' => 'applications/calendar/controller/PhabricatorCalendarEventViewController.php',
'PhabricatorCalendarExport' => 'applications/calendar/storage/PhabricatorCalendarExport.php',
+ 'PhabricatorCalendarExportDisableController' => 'applications/calendar/controller/PhabricatorCalendarExportDisableController.php',
'PhabricatorCalendarExportDisableTransaction' => 'applications/calendar/xaction/PhabricatorCalendarExportDisableTransaction.php',
'PhabricatorCalendarExportEditController' => 'applications/calendar/controller/PhabricatorCalendarExportEditController.php',
'PhabricatorCalendarExportEditEngine' => 'applications/calendar/editor/PhabricatorCalendarExportEditEngine.php',
@@ -6849,6 +6850,7 @@
'PhabricatorApplicationTransactionInterface',
'PhabricatorDestructibleInterface',
),
+ 'PhabricatorCalendarExportDisableController' => 'PhabricatorCalendarController',
'PhabricatorCalendarExportDisableTransaction' => 'PhabricatorCalendarExportTransactionType',
'PhabricatorCalendarExportEditController' => 'PhabricatorCalendarController',
'PhabricatorCalendarExportEditEngine' => 'PhabricatorEditEngine',
diff --git a/src/applications/calendar/application/PhabricatorCalendarApplication.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
--- a/src/applications/calendar/application/PhabricatorCalendarApplication.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -71,6 +71,9 @@
=> 'PhabricatorCalendarExportViewController',
'ics/(?P<secretKey>[^/]+)/(?P<filename>[^/]*)'
=> 'PhabricatorCalendarExportICSController',
+ 'disable/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorCalendarExportDisableController',
+
),
),
);
diff --git a/src/applications/calendar/controller/PhabricatorCalendarExportDisableController.php b/src/applications/calendar/controller/PhabricatorCalendarExportDisableController.php
new file mode 100644
--- /dev/null
+++ b/src/applications/calendar/controller/PhabricatorCalendarExportDisableController.php
@@ -0,0 +1,63 @@
+<?php
+
+final class PhabricatorCalendarExportDisableController
+ extends PhabricatorCalendarController {
+
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+
+ $export = id(new PhabricatorCalendarExportQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($request->getURIData('id')))
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->executeOne();
+ if (!$export) {
+ return new Aphront404Response();
+ }
+
+ $export_uri = $export->getURI();
+ $is_disable = !$export->getIsDisabled();
+
+ if ($request->isFormPost()) {
+ $xactions = array();
+ $xactions[] = id(new PhabricatorCalendarExportTransaction())
+ ->setTransactionType(
+ PhabricatorCalendarExportDisableTransaction::TRANSACTIONTYPE)
+ ->setNewValue($is_disable ? 1 : 0);
+
+ $editor = id(new PhabricatorCalendarExportEditor())
+ ->setActor($viewer)
+ ->setContinueOnNoEffect(true)
+ ->setContinueOnMissingFields(true)
+ ->setContentSourceFromRequest($request);
+
+ $editor->applyTransactions($export, $xactions);
+
+ return id(new AphrontRedirectResponse())->setURI($export_uri);
+ }
+
+ if ($is_disable) {
+ $title = pht('Disable Export');
+ $body = pht(
+ 'Disable this export? The export URI will no longer function.');
+ $button = pht('Disable Export');
+ } else {
+ $title = pht('Enable Export');
+ $body = pht(
+ 'Enable this export? Anyone who knows the export URI will be able '.
+ 'to export the data.');
+ $button = pht('Enable Export');
+ }
+
+ return $this->newDialog()
+ ->setTitle($title)
+ ->appendParagraph($body)
+ ->addCancelButton($export_uri)
+ ->addSubmitButton($button);
+ }
+
+}
diff --git a/src/applications/calendar/controller/PhabricatorCalendarExportICSController.php b/src/applications/calendar/controller/PhabricatorCalendarExportICSController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarExportICSController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarExportICSController.php
@@ -24,6 +24,10 @@
return new Aphront404Response();
}
+ if ($export->getIsDisabled()) {
+ return new Aphront404Response();
+ }
+
$author = id(new PhabricatorPeopleQuery())
->setViewer($omnipotent)
->withPHIDs(array($export->getAuthorPHID()))
diff --git a/src/applications/calendar/controller/PhabricatorCalendarExportViewController.php b/src/applications/calendar/controller/PhabricatorCalendarExportViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarExportViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarExportViewController.php
@@ -55,7 +55,7 @@
if ($export->getIsDisabled()) {
$icon = 'fa-ban';
- $color = 'grey';
+ $color = 'red';
$status = pht('Disabled');
} else {
$icon = 'fa-check';
@@ -102,6 +102,24 @@
->setIcon('fa-download')
->setHref($ics_uri));
+ $disable_uri = "export/disable/{$id}/";
+ $disable_uri = $this->getApplicationURI($disable_uri);
+ if ($export->getIsDisabled()) {
+ $disable_name = pht('Enable Export');
+ $disable_icon = 'fa-check';
+ } else {
+ $disable_name = pht('Disable Export');
+ $disable_icon = 'fa-ban';
+ }
+
+ $curtain->addAction(
+ id(new PhabricatorActionView())
+ ->setName($disable_name)
+ ->setIcon($disable_icon)
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(true)
+ ->setHref($disable_uri));
+
return $curtain;
}
@@ -140,14 +158,18 @@
$ics_uri = $export->getICSURI();
$ics_uri = PhabricatorEnv::getURI($ics_uri);
- $properties->addProperty(
- pht('ICS URI'),
- phutil_tag(
+ if ($export->getIsDisabled()) {
+ $ics_href = phutil_tag('em', array(), $ics_uri);
+ } else {
+ $ics_href = phutil_tag(
'a',
array(
'href' => $ics_uri,
),
- $ics_uri));
+ $ics_uri);
+ }
+
+ $properties->addProperty(pht('ICS URI'), $ics_href);
return $properties;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Oct 15 2024, 5:02 PM (4 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6713620
Default Alt Text
D16681.id40160.diff (6 KB)
Attached To
Mode
D16681: Allow Calendar exports to be disabled
Attached
Detach File
Event Timeline
Log In to Comment