Merge pull request #651 from topcoder-platform/issues-648

Issues 648

Author: jmgasper

config/vanilla/config.php

@@ -3,7 +3,7 @@
 $Configuration['Garden']['Installed'] = true;
 //Embed
 $Configuration['Garden']['Embed']['Allow'] = true;
-$Configuration['Garden']['Embed']['ForceForum'] = true;
+$Configuration['Garden']['Embed']['ForceForum'] = false;
 
 $Configuration['Database']['Name'] = getenv('MYSQL_DATABASE');
 $Configuration['Database']['Host'] = getenv('MYSQL_HOST');
@@ -71,10 +71,8 @@
 $Configuration['Garden']['ForceInputFormatter'] = false;
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
-// Default Topcoder Theme
-//$Configuration['Garden']['Theme'] = 'topcoder';
-// MFE Topcoder Theme
-$Configuration['Garden']['Theme'] = 'mfe-topcoder';
+// MFE Topcoder Theme 'mfe-topcoder'
+$Configuration['Garden']['Theme'] = 'topcoder';
 $Configuration['Garden']['MobileTheme'] = 'topcoder';
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
 $Configuration['Garden']['SystemUserID'] = '1';

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

@@ -95,6 +95,19 @@ protected function buildBreadcrumbs($CategoryID) {
         $Category = CategoryModel::categories($CategoryID);
         $ancestors = CategoryModel::getAncestors($CategoryID);
         $parentCategoryID = val('ParentCategoryID', $Category);
+        // FIX https://github.com/topcoder-platform/forums/issues/648
+        if(getIncomingValue('embed_type') == 'mfe') {
+          if(val('GroupID', $Category) > 0) {
+            $temp = [];
+            foreach ($ancestors as $id => $ancestor) {
+                if ($ancestor['GroupID'] > 0) {
+                     $temp[$ancestor['CategoryID']] = $ancestor;
+                }
+            }
+            return $temp;
+          }
+        }
+
         if(val('GroupID', $Category) > 0) {
             $challenge = $this->data('Challenge');
             $track = $challenge ? $challenge['Track']: false;

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

@@ -191,11 +191,13 @@ function writeListItem($category, $depth) {
                     <div class="CategoryDescription">
                         <?php echo val('Description', $category) ?>
                     </div>
+                    <?php if(getIncomingValue('embed_type') != 'mfe') { ?>
                     <div class="Challenge">
                         <?php
                             Gdn::controller()->fireEvent('AfterChallenge', ['Category' =>$category]);
                         ?>
                     </div>
+                    <?php  } ?>
                     <div class="Meta">
                         <?php if (val('LastTitle', $category) != '') { ?>
                             <span class="MItem LastDiscussionTitle">

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

@@ -48,7 +48,10 @@
 if($this instanceof CategoriesController) {
     echo discussionSorts();
 }
-echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
+
+if(getIncomingValue('embed_type') != 'mfe') {
+    echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
+}
 echo '</div>';
 echo '<div class="PageControls Top">';
 PagerModule::write($PagerOptions);
@@ -65,7 +68,9 @@
 
     echo '<div class="PageControls Bottom">';
     PagerModule::write($PagerOptions);
-    echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
+    if(getIncomingValue('embed_type') != 'mfe') {
+        echo Gdn_Theme::module('NewDiscussionModule', $this->data('_NewDiscussionProperties', ['CssClass' => 'Button Action Primary']));
+    }
     echo '</div>';
 
 } else {