Merge pull request #492 from topcoder-platform/issues-477

Issues-477, Issues-478, Issues-481

Author: jmgasper

config/vanilla/bootstrap.before.php

@@ -299,13 +299,14 @@ function_exists('topcoderRoleCssStyles')) {
      */
     function dateUpdated($row, $wrap = null) {
         $result = '';
+        $insertUserID = val('InsertUserID', $row);
         $dateUpdated = val('DateUpdated', $row);
         $updateUserID = val('UpdateUserID', $row);
 
         if ($dateUpdated) {
             $updateUser = Gdn::userModel()->getID($updateUserID);
             $dateUpdatedFormatted = Gdn::getContainer()->get(DateTimeFormatter::class)->formatDate($dateUpdated, false, DateTimeFormatter::FORCE_FULL_FORMAT);
-            if ($updateUser) {
+            if ($updateUser && $insertUserID != $updateUserID) {
                 $title = sprintf(t('Edited %s by %s.'), $dateUpdatedFormatted, val('Name', $updateUser));
                 $link = userAnchor($updateUser);
                 $text =  sprintf(t('edited %s by %s'), $dateUpdatedFormatted, $link);

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

@@ -539,7 +539,7 @@ public function all($Category = '', $displayAs = '') {
             if ($Title) {
                 $this->title($Title, '');
             } else {
-                $this->title(t('Roundtables'));
+                $this->title(t('Public Forums'));
             }
         }
         Gdn_Theme::section('CategoryList');
@@ -677,7 +677,7 @@ public function discussions($Category = '') {
             if ($Title) {
                 $this->title($Title, '');
             } else {
-                $this->title(t('Roundtables'));
+                $this->title(t('Public Forums'));
             }
         }
 

vanilla/applications/vanilla/controllers/class.vanillacontroller.php

@@ -13,8 +13,8 @@
  */
 class VanillaController extends Gdn_Controller {
 
-    const ROOT_CATEGORY =  ['Name' => 'Roundtables', 'Url'=>'/'];
-
+    const ROOT_CATEGORY =  ['Name' => 'Public Forums', 'Url'=>'/'];
+    const CHALLENGE_FORUMS_URLCODE = 'challenges-forums';
     /**
      * Include JS, CSS, and modules used by all methods.
      *
@@ -81,15 +81,27 @@ protected function buildBreadcrumbs($CategoryID) {
                 if($ancestor['GroupID'] > 0) {
                     $temp[$ancestor['CategoryID']] = $ancestor;
                 } else {
-                    if($ancestor['UrlCode'] == 'challenges-forums') {
-                        array_push($temp,  ['Name' => 'Challenge Discussions', 'Url'=>'/groups/mine?filter=challenge']);
+                    if($ancestor['UrlCode'] == self::CHALLENGE_FORUMS_URLCODE) {
+                        array_push($temp,  ['Name' => 'Challenge Forums', 'Url'=>'/groups/mine?filter=challenge']);
                     }else if($ancestor['UrlCode'] == 'groups') {
-                        array_push($temp,  ['Name' => 'Group Discussions', 'Url'=>'/groups/mine?filter=regular']);
+                        array_push($temp,  ['Name' => 'Group Forums', 'Url'=>'/groups/mine?filter=regular']);
                     }
                 }
             }
             return $temp;
         } else {
+            $urlCode = val('UrlCode', $Category);
+            if($urlCode == self::CHALLENGE_FORUMS_URLCODE) {
+                return $ancestors;
+            }
+
+            // Check if ancestors contains 'challenges-forums'
+            foreach ($ancestors as $id => $ancestor) {
+                if($ancestor['UrlCode'] == self::CHALLENGE_FORUMS_URLCODE) {
+                    return $ancestors;
+                }
+            }
+
             array_unshift($ancestors, self::ROOT_CATEGORY);
             return $ancestors;
         }

vanilla/applications/vanilla/views/categories/all.php

@@ -6,9 +6,9 @@
     $title .= watchButton($this->Category->CategoryID);
 }
 echo '<h1 class="H HomepageTitle">'.$title.'</h1>';
-// if ($description = $this->description()) {
-    //echo wrap($description, 'div', ['class' => 'P PageDescription']);
-// }
+if ($description = $this->description()) {
+    echo wrap($description, 'div', ['class' => 'P PageDescription']);
+ }
 $this->fireEvent('AfterPageTitle');
 echo '<div class="PageControls Top">';
 if ($this->data('EnableFollowingFilter')) {

vanilla/applications/vanilla/views/categories/helper_functions.php

@@ -147,6 +147,11 @@ function mostRecentString($row) {
      * @throws Exception
      */
     function writeListItem($category, $depth) {
+        $urlcode = $category['UrlCode'];
+        // FIX: https://github.com/topcoder-platform/forums/issues/477: Don't show 'Challenge Forums'
+        if($urlcode == VanillaController::CHALLENGE_FORUMS_URLCODE) {
+            return;
+        }
         $children = $category['Children'];
         $categoryID = val('CategoryID', $category);
         $cssClass = cssClass($category, true);
@@ -183,6 +188,9 @@ function writeListItem($category, $depth) {
                         Gdn::controller()->fireEvent('AfterCategoryTitle');
                         ?>
                     </div>
+                    <div class="CategoryDescription">
+                        <?php echo val('Description', $category) ?>
+                    </div>
                     <div class="Challenge">
                         <?php
                             Gdn::controller()->fireEvent('AfterChallenge', ['Category' =>$category]);

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

@@ -10,8 +10,8 @@
     watchButton($this->data('Category.CategoryID')).
     '</h1>';
 
-// $Description = $this->data('Category.Description', $this->description());
-// echo wrapIf(Gdn_Format::htmlFilter($Description), 'div', ['class' => 'P PageDescription']);
+$Description = $this->data('Category.Description', $this->description());
+echo wrapIf(Gdn_Format::htmlFilter($Description), 'div', ['class' => 'P PageDescription']);
 
 $this->fireEvent('AfterPageTitle');
 

vanilla/applications/vanilla/views/modules/discussionfilter.php

@@ -42,7 +42,7 @@
                 || strpos(strtolower($Controller->Request->path()) , 'categories') === 0) {
                 $CssClass .= ' Active';
             }
-            echo '<li class="'.$CssClass.'">'.anchor('Roundtables', '/categories').'</li> ';
+            echo '<li class="'.$CssClass.'">'.anchor('Public Forums', '/categories').'</li> ';
         }
         /*
            <li id="RecentDiscussions" class="Discussions<?php echo strtolower($Controller->ControllerName) == 'discussionscontroller' && strtolower($Controller->RequestMethod) == 'index' && strpos(strtolower($Controller->Request->path()) , 'discussions') === 0? ' Active' : ''; ?>">