Page MenuHomestyx hydra
Files F10041700

No OneTemporary
Actions

View Options

diff --git a/src/applications/phriction/controller/PhrictionDeleteController.php b/src/applications/phriction/controller/PhrictionDeleteController.php
index ae25e8b006..18670f100a 100644
--- a/src/applications/phriction/controller/PhrictionDeleteController.php
+++ b/src/applications/phriction/controller/PhrictionDeleteController.php
@@ -1,78 +1,62 @@
<?php
/**
* @group phriction
*/
final class PhrictionDeleteController extends PhrictionController {
private $id;
public function willProcessRequest(array $data) {
$this->id = $data['id'];
}
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
$document = id(new PhrictionDocument())->load($this->id);
if (!$document) {
return new Aphront404Response();
}
- $error_view = null;
+ $e_text = null;
$disallowed_states = array(
PhrictionDocumentStatus::STATUS_DELETED, // Stupid
PhrictionDocumentStatus::STATUS_MOVED, // Makes no sense
);
if (in_array($document->getStatus(), $disallowed_states)) {
- $is_serious =
- PhabricatorEnv::getEnvConfig('phabricator.serious-business');
-
- if ($is_serious) {
- $e_text = pht('An already moved or deleted document can not be '.
- 'deleted');
- } else {
- $e_text = pht('I\'m not sure if you got the notice, but you can\'t '.
- 'delete an already deleted or moved document.');
- }
-
- $error_view = new AphrontErrorView();
- $error_view->setSeverity(AphrontErrorView::SEVERITY_ERROR);
- $error_view->setTitle(pht('Can not delete page'));
- $error_view->appendChild($e_text);
-
- $error_view = $error_view->render();
+ $e_text = pht('An already moved or deleted document can not be deleted');
}
$document_uri = PhrictionDocument::getSlugURI($document->getSlug());
- if (!$error_view && $request->isFormPost()) {
+ if (!$e_text && $request->isFormPost()) {
$editor = id(PhrictionDocumentEditor::newForSlug($document->getSlug()))
->setActor($user)
->delete();
return id(new AphrontRedirectResponse())->setURI($document_uri);
}
- if ($error_view) {
+ if ($e_text) {
$dialog = id(new AphrontDialogView())
->setUser($user)
- ->setTitle(pht('Error!'))
- ->appendChild($error_view)
+ ->setTitle(pht('Can not delete document!'))
+ ->appendChild($e_text)
->addCancelButton($document_uri);
} else {
$dialog = id(new AphrontDialogView())
->setUser($user)
->setTitle(pht('Delete document?'))
->appendChild(
pht('Really delete this document? You can recover it later by '.
'reverting to a previous version.'))
->addSubmitButton(pht('Delete'))
->addCancelButton($document_uri);
}
return id(new AphrontDialogResponse())->setDialog($dialog);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Mar 16, 9:38 AM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
962549
Default Alt Text
(2 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!)