Merge pull request #212 from topcoder-platform/issues-133

Issues-133, Issues-136, Vanilla bugs

Author: jmgasper

config/vanilla/bootstrap.early.php

@@ -2,34 +2,58 @@
 
 if (c('Garden.Installed')) {
 
-    $Database = Gdn::database();
-    $SQL = $Database->sql();
-
-    $Construct = $Database->structure();
-
     // Update Vanilla Role Names
     Gdn::sql()->update('Role')->set('Name', 'Vanilla Member')->where('RoleID', 8)->put();
     Gdn::sql()->update('Role')->set('Name', 'Vanilla Admin')->where('RoleID', 16)->put();
     Gdn::sql()->update('Role')->set('Name', 'Vanilla Moderator')->where('RoleID', 32)->put();
 
 
     //
-    // Update Vanilla tables
+    // Update Vanilla tables and data
     //
 
     //Add extra columns in Category : https://github.com/topcoder-platform/forums/issues/178
-    $Construct->table('Category');
-    $GroupIDExists = $Construct->columnExists('GroupID');
-    if(!$GroupIDExists) {
-        $Construct->column('GroupID', 'int', true, 'key');
-        $Construct->set(false, false);
-    }
-
-    // Update data after adding GroupID column: https://github.com/topcoder-platform/forums/issues/178
-    Gdn::sql()->query("UPDATE GDN_Category c
-        INNER JOIN (select c.CategoryID, g.GroupID from GDN_Category c , GDN_Group g where c.UrlCode like concat(g.ChallengeID,'%')) as src
+    if(!Gdn::structure()->table('Category')->columnExists('GroupID')) {
+        Gdn::structure()->table('Category')
+            ->column('GroupID', 'int', true, 'key')
+            ->set(false, false);
+
+        // Update data after adding GroupID column: https://github.com/topcoder-platform/forums/issues/178
+        Gdn::sql()->query("UPDATE GDN_Category c
+        INNER JOIN (SELECT c.CategoryID, g.GroupID FROM GDN_Category c , GDN_Group g WHERE c.UrlCode LIKE concat(g.ChallengeID,'%')) AS src
         ON src.CategoryID = c.CategoryID
         SET c.GroupID = src.GroupID
-        WHERE c.GroupID is null");
+        WHERE c.GroupID IS NULL");
+    }
+
+
 
+    // Add the column Type in Group : https://github.com/topcoder-platform/forums/issues/133
+    if(! Gdn::structure()->table('Group')->columnExists('Privacy')) {
+        if(Gdn::structure()->table('Group')->renameColumn('Type', 'Privacy')) {
+
+            // Reset the internal state of this object so that it can be reused.
+            Gdn::structure()->reset();
+
+            Gdn::structure()->table('Group')
+            ->column('Type', ['challenge', 'regular'], true)
+            ->set(false, false);
+
+            // Update existing data, all groups with ChallengeID will have the type 'challenge'
+            Gdn::sql()->query("UPDATE GDN_Group g
+                SET g.Type = CASE WHEN g.ChallengeID IS NOT NULL THEN 'challenge'
+                ELSE 'regular' END");
+
+            Gdn::structure()->table('Group')
+            ->column('Type', ['challenge', 'regular'], false)
+            ->set(false, false);
+        }
+    }
+
+    // Add the column Archived in Group : https://github.com/topcoder-platform/forums/issues/136
+    if(!Gdn::structure()->table('Group')->columnExists('Archived')) {
+        Gdn::structure()->table('Group')
+            ->column('Archived', 'tinyint(1)', '0')
+            ->set(false, false);
+    }
 }

config/vanilla/bootstrap.late.php

@@ -19,9 +19,10 @@
         'Groups.Group.Edit',
         'Groups.Category.Manage',
         'Groups.Moderation.Manage',
-        'Groups.EmailInvitations.Add']);
-
+        'Groups.EmailInvitations.Add',
+        'Groups.Group.Archive']);
 
+   // TODO: need to be sure that all roles and permissions haven't be changed manually in prod/dev
     updateTopcoderRolePermissions(RoleModel::TOPCODER_ROLES);
-    updateTopcoderRolePermissions(RoleModel::TOPCODER_PROJECT_ROLES);
+   // updateTopcoderRolePermissions(RoleModel::TOPCODER_PROJECT_ROLES);
 }

vanilla/applications/dashboard/models/class.rolemodel.php

@@ -83,6 +83,7 @@ class RoleModel extends Gdn_Model {
         'Vanilla.Comments.Edit' => 1,
         'Vanilla.Comments.Delete' => 1,
         'Plugins.Attachments.Upload.Allow' => 1,
+        'Groups.Group.Archive' => 1
 
     ];
     const TOPCODER_ROLES = [

vanilla/applications/vanilla/views/discussions/helper_functions.php

@@ -450,7 +450,7 @@ function writeFilterTabs($sender) {
                 }
                 if (($countDiscussions > 0 || $sender->RequestMethod == 'mine') && c('Vanilla.Discussions.ShowMineTab', true)) {
                     ?>
-                    <li<?php echo $sender->RequestMethod == 'mine' ? ' class="Active"' : ''; ?>><?php echo anchor($myDiscussions, '/discussions/mine', 'MyDiscussions TabLink'); ?></li>
+                    <li<?php echo $sender->RequestMethod == 'mine'  && $sender->ControllerName == 'discussionscontroller' ? ' class="Active"' : ''; ?>><?php echo anchor($myDiscussions, '/discussions/mine', 'MyDiscussions TabLink'); ?></li>
                 <?php
                 }
                 if ($countDrafts > 0 || $sender->ControllerName == 'draftscontroller') {

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

@@ -57,7 +57,7 @@ function filterCountString($count, $url = '') {
         }
         if (($CountDiscussions > 0 || $Controller->RequestMethod == 'mine') && c('Vanilla.Discussions.ShowMineTab', true)) {
             ?>
-            <li class="MyDiscussions<?php echo $Controller->RequestMethod == 'mine' ? ' Active' : ''; ?>"><?php echo anchor(sprite('SpMyDiscussions').' '.$MyDiscussions, '/discussions/mine'); ?></li>
+            <li class="MyDiscussions<?php echo $Controller->ControllerName == 'discussionscontroller' && $Controller->RequestMethod == 'mine' ? ' Active' : ''; ?>"><?php echo anchor(sprite('SpMyDiscussions').' '.$MyDiscussions, '/discussions/mine'); ?></li>
             <?php
         }
         if ($CountDrafts > 0 || $Controller->ControllerName == 'draftscontroller') {