Merge pull request #351 from topcoder-platform/issues-347

Issues-347: fixed cancel url for draft

Author: jmgasper

vanilla/applications/vanilla/controllers/class.postcontroller.php

@@ -443,6 +443,9 @@ public function editDiscussion($discussionID = '', $draftID = '') {
             $record = $this->Draft = $this->DraftModel->getID($draftID);
             $this->CategoryID = $this->Draft->CategoryID;
             $this->setData('ShowPreviewButton', $record->Format != 'Rich');
+
+            // FIX: https://github.com/topcoder-platform/forums/issues/347
+            $this->setData('_CancelUrl', '/drafts');
             // Verify this is their draft
             if (val('InsertUserID', $this->Draft) != Gdn::session()->UserID) {
                 throw permissionException();
@@ -455,6 +458,7 @@ public function editDiscussion($discussionID = '', $draftID = '') {
             $this->fireEvent('BeforeEditDiscussion');
             $this->setData('Discussion', $record, true);
             $this->CategoryID = $this->Discussion->CategoryID;
+            $this->setData('_CancelUrl', discussionUrl($this->data('Discussion')));
         }
 
         // Normalize the edit data.
@@ -467,8 +471,6 @@ public function editDiscussion($discussionID = '', $draftID = '') {
             $this->Form->removeFormValue('Format');
         }
 
-        $this->setData('_CancelUrl', discussionUrl($this->data('Discussion')));
-
         // Set view and render
         $this->View = 'Discussion';
         $this->discussion($this->CategoryID);