Merge pull request #579 from topcoder-platform/issues-553

Issues-553: Fixed New Discussion button

Author: jmgasper

vanilla/applications/vanilla/controllers/class.categoriescontroller.php

@@ -417,10 +417,10 @@ public function index($categoryIdentifier = '', $page = '0') {
                 $this->Head->addRss(categoryUrl($category) . '/feed.rss', $this->Head->title());
             }
 
-            if($category->DisplayAs == 'Discussions') {
+           // if($category->DisplayAs == 'Discussions') {
                 // Add modules
-                $this->addModule('NewDiscussionModule');
-            }
+            //    $this->addModule('NewDiscussionModule');
+            //}
             $this->addModule('DiscussionFilterModule');
             // FIX: https://github.com/topcoder-platform/forums/issues/548
             // Show only for 'Public forums'
@@ -652,10 +652,11 @@ public function all($Category = '', $displayAs = '') {
 
         $this->setData('CategoryTree', $categoryTree);
 
-        // Add modules
-        if($Category && $displayAs == 'Discussions') {
-            $this->addModule('NewDiscussionModule');
-        }
+       // Add modules
+       // FIX: https://github.com/topcoder-platform/forums/issues/553
+       // if($Category && $displayAs == 'Discussions') {
+       //     $this->addModule('NewDiscussionModule');
+       // }
         $this->addModule('DiscussionFilterModule');
         $this->addModule('BookmarkedModule');
         // FIX: https://github.com/topcoder-platform/forums/issues/548
@@ -754,7 +755,8 @@ public function discussions($Category = '') {
         $this->setData('Discussions', $Discussions);
 
         // Add modules
-        $this->addModule('NewDiscussionModule');
+        // https://github.com/topcoder-platform/forums/issues/553
+        // $this->addModule('NewDiscussionModule');
         $this->addModule('DiscussionFilterModule');
         // FIX: https://github.com/topcoder-platform/forums/issues/548
         // Show only for 'Public forums'

vanilla/applications/vanilla/controllers/class.discussioncontroller.php

@@ -296,7 +296,7 @@ public function index($DiscussionID = '', $DiscussionStub = '', $Page = '') {
 
         // Add modules
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('NewDiscussionModule');
+        // $this->addModule('NewDiscussionModule');
 
         // FIX: https://github.com/topcoder-platform/forums/issues/548
         // Show only for 'Public forums'

vanilla/applications/vanilla/controllers/class.discussionscontroller.php

@@ -458,7 +458,7 @@ public function bookmarked($page = '0') {
 
         // Add modules
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('NewDiscussionModule');
+        // $this->addModule('NewDiscussionModule');
         // $this->addModule('CategoriesModule');
         $this->addModule('TagModule');
 

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

@@ -1035,7 +1035,7 @@ public function editComment($commentID = '', $draftID = '') {
      */
     public function initialize() {
         // Add modules
-        $this->addModule('NewDiscussionModule');
+        // $this->addModule('NewDiscussionModule');
         $this->addModule('DiscussionFilterModule');
         $this->addModule('BookmarkedModule');
 

vanilla/applications/vanilla/views/discussions/index.php

@@ -40,14 +40,14 @@
 
 echo '<div class="PageControls Top">';
 PagerModule::write($PagerOptions);
-echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
 // Avoid displaying in a category's list of discussions.
 if ($this->data('EnableFollowingFilter')) {
     echo discussionFilters();
 }
 if($this instanceof CategoriesController) {
     echo discussionSorts();
 }
+echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
 $this->fireEvent('PageControls');
 echo '</div>';