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
This commit is contained in:
		 Anh Nhan Nguyen
					Anh Nhan Nguyen
				
			
				
					committed by
					
						 epriestley
						epriestley
					
				
			
			
				
	
			
			
			 epriestley
						epriestley
					
				
			
						parent
						
							05c5c43159
						
					
				
				
					commit
					f1be01527f
				
			| @@ -21,45 +21,29 @@ final class PhrictionDeleteController extends PhrictionController { | |||||||
|       return new Aphront404Response(); |       return new Aphront404Response(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     $error_view = null; |     $e_text = null; | ||||||
|     $disallowed_states = array( |     $disallowed_states = array( | ||||||
|       PhrictionDocumentStatus::STATUS_DELETED, // Stupid |       PhrictionDocumentStatus::STATUS_DELETED, // Stupid | ||||||
|       PhrictionDocumentStatus::STATUS_MOVED, // Makes no sense |       PhrictionDocumentStatus::STATUS_MOVED, // Makes no sense | ||||||
|     ); |     ); | ||||||
|     if (in_array($document->getStatus(), $disallowed_states)) { |     if (in_array($document->getStatus(), $disallowed_states)) { | ||||||
|       $is_serious = |       $e_text = pht('An already moved or deleted document can not be deleted'); | ||||||
|         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(); |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     $document_uri = PhrictionDocument::getSlugURI($document->getSlug()); |     $document_uri = PhrictionDocument::getSlugURI($document->getSlug()); | ||||||
|  |  | ||||||
|     if (!$error_view && $request->isFormPost()) { |     if (!$e_text && $request->isFormPost()) { | ||||||
|         $editor = id(PhrictionDocumentEditor::newForSlug($document->getSlug())) |         $editor = id(PhrictionDocumentEditor::newForSlug($document->getSlug())) | ||||||
|           ->setActor($user) |           ->setActor($user) | ||||||
|           ->delete(); |           ->delete(); | ||||||
|         return id(new AphrontRedirectResponse())->setURI($document_uri); |         return id(new AphrontRedirectResponse())->setURI($document_uri); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if ($error_view) { |     if ($e_text) { | ||||||
|       $dialog = id(new AphrontDialogView()) |       $dialog = id(new AphrontDialogView()) | ||||||
|         ->setUser($user) |         ->setUser($user) | ||||||
|         ->setTitle(pht('Error!')) |         ->setTitle(pht('Can not delete document!')) | ||||||
|         ->appendChild($error_view) |         ->appendChild($e_text) | ||||||
|         ->addCancelButton($document_uri); |         ->addCancelButton($document_uri); | ||||||
|     } else { |     } else { | ||||||
|       $dialog = id(new AphrontDialogView()) |       $dialog = id(new AphrontDialogView()) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user