From f1be01527fdb91f15da087ed0de1db2db14acdfa Mon Sep 17 00:00:00 2001
From: Anh Nhan Nguyen <anhnhan@outlook.com>
Date: Wed, 13 Mar 2013 10:30:39 -0700
Subject: [PATCH] Wiped ErrorView from PhrictionDeleteController

Summary: Exactly what it says on the tin

Test Plan: deleted an document in all kinds of fashions. No fatalities, no exceptions, all dialogs appeared fine.

Reviewers: epriestley, chad, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2686

Differential Revision: https://secure.phabricator.com/D5331
---
 .../controller/PhrictionDeleteController.php  | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

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
@@ -21,45 +21,29 @@ final class PhrictionDeleteController extends PhrictionController {
       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())