Skip to content

Issues-553: Fixed New Discussion button #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2021
Merged

Issues-553: Fixed New Discussion button #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions vanilla/applications/vanilla/controllers/class.categoriescontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/controllers/class.discussioncontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/controllers/class.discussionscontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/controllers/class.postcontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/views/discussions/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>';

Expand Down