Revert overly aggressive killing.

(don't worry--askbot is still dead)

lms/envs/common.py

@@ -66,7 +66,6 @@ MITX_FEATURES = {
                                         # set to None to do no university selection
 
     'ENABLE_TEXTBOOK' : True,
-    'ENABLE_DISCUSSION' : False,
     'ENABLE_DISCUSSION_SERVICE': True,
 
     'ENABLE_PSYCHOMETRICS': False,	# real-time psychometrics (eg item response theory analysis in instructor dashboard)
@@ -360,6 +359,7 @@ MIDDLEWARE_CLASSES = (
 
     'course_wiki.course_nav.Middleware',
 
+    'django.middleware.transaction.TransactionMiddleware',
     # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 
     'django_comment_client.utils.ViewNameMiddleware',
@@ -594,6 +594,7 @@ INSTALLED_APPS = (
 
     # For testing
     'django_jasmine',
+    'django.contrib.admin',   # only used in DEBUG mode
 
     # Discussion forums
     'django_comment_client',

lms/envs/dev_ike.py

@@ -14,7 +14,6 @@ import socket
 
 WIKI_ENABLED = False
 MITX_FEATURES['ENABLE_TEXTBOOK'] = False
-MITX_FEATURES['ENABLE_DISCUSSION'] = False
 MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True	  # require that user be in the staff_* group to be able to enroll
 MITX_FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = False
 MITX_FEATURES['SUBDOMAIN_BRANDING'] = False

lms/urls.py

@@ -1,8 +1,14 @@
 from django.conf import settings
 from django.conf.urls import patterns, include, url
+from django.contrib import admin
 from django.conf.urls.static import static
 import django.contrib.auth.views
 
+# Uncomment the next two lines to enable the admin:
+if settings.DEBUG:
+    from django.contrib import admin
+    admin.autodiscover()
+
 urlpatterns = ('',
     url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
@@ -236,8 +242,10 @@ if settings.QUICKEDIT:
     urlpatterns += (url(r'^dogfood/(?P<id>[^/]*)$', 'dogfood.views.df_capa_problem'),)
 
 if settings.DEBUG:
-    ## Jasmine
-    urlpatterns=urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),)
+    ## Jasmine and admin
+    urlpatterns=urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),
+                    url(r'^admin/', include(admin.site.urls)),
+                    )
 
 if settings.MITX_FEATURES.get('AUTH_USE_OPENID'):
     urlpatterns += (