From a2c4010b8fe6615aa65e833fe5011b8a520646e4 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sat, 10 Mar 2012 20:13:03 -0500
Subject: [PATCH] Removed caching for dev machines

---
 courseware/content_parser.py | 8 +++++++-
 settings.py                  | 1 +
 student/models.py            | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/courseware/content_parser.py b/courseware/content_parser.py
index 35ee7b5018..2aefcbb8d0 100644
--- a/courseware/content_parser.py
+++ b/courseware/content_parser.py
@@ -151,7 +151,13 @@ def user_groups(user):
     # TODO: Rewrite in Django
     key = 'user_group_names_{user.id}'.format(user=user)
     cache_expiration = 60 * 60 # one hour
-    group_names = cache.get(fasthash(key))
+    
+    # Kill caching on dev machines -- we switch groups a lot
+    if "dev" not in setting.DEFAULT_GROUPS:
+        group_names = cache.get(fasthash(key))
+    else: 
+        group_names = None
+ 
     if group_names is None:
         group_names = [u.name for u in UserTestGroup.objects.filter(users=user)]
         cache.set(fasthash(key), group_names, cache_expiration)
diff --git a/settings.py b/settings.py
index e8b0d2b1e7..cce3dfad4e 100644
--- a/settings.py
+++ b/settings.py
@@ -6,6 +6,7 @@ import tempfile
 import djcelery
 
 # from settings2.askbotsettings import LIVESETTINGS_OPTIONS
+DEFAULT_GROUPS = []
 
 # Configuration option for when we want to grab server error pages
 STATIC_GRAB = False
diff --git a/student/models.py b/student/models.py
index 024da56260..268503a7f3 100644
--- a/student/models.py
+++ b/student/models.py
@@ -103,3 +103,8 @@ def add_user_to_group(group, user):
     utg = UserTestGroup.objects.get(name = group)
     utg.users.add(User.objects.get(username = user))
     utg.save()
+
+def remove_user_from_group(group, user):
+    utg = UserTestGroup.objects.get(name = group)
+    utg.users.add(User.objects.get(username = user))
+    utg.save()