Merge pull request #760 from edx/diana/move-course-modes-to-common

Move course modes to common and enable in Studio admin

Merge pull request #760 from edx/diana/move-course-modes-to-common
Move course modes to common and enable in Studio admin
deb55380 · Diana Huang · 2f466537 · 70e1c70e · deb55380 · deb55380
Commit deb55380 authored Aug 21, 2013 by Diana Huang
10 changed files
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -355,7 +355,10 @@ INSTALLED_APPS = (
    'django_comment_common',

    # for course creator table
-    'django.contrib.admin'
+    'django.contrib.admin',
+
+    # for managing course modes
+    'course_modes'
 )

 ################# EDX MARKETING SITE ##################################

--- a/lms/djangoapps/course_modes/__init__.py
+++ b/lms/djangoapps/course_modes/__init__.py
--- a/lms/djangoapps/course_modes/admin.py
+++ b/lms/djangoapps/course_modes/admin.py
--- a/lms/djangoapps/course_modes/migrations/0001_initial.py
+++ b/lms/djangoapps/course_modes/migrations/0001_initial.py
--- a/lms/djangoapps/course_modes/migrations/0002_auto__add_field_coursemode_currency.py
+++ b/lms/djangoapps/course_modes/migrations/0002_auto__add_field_coursemode_currency.py
--- a/lms/djangoapps/course_modes/migrations/0003_auto__add_unique_coursemode_course_id_currency_mode_slug.py
+++ b/lms/djangoapps/course_modes/migrations/0003_auto__add_unique_coursemode_course_id_currency_mode_slug.py
--- a/lms/djangoapps/course_modes/migrations/__init__.py
+++ b/lms/djangoapps/course_modes/migrations/__init__.py
--- a/lms/djangoapps/course_modes/models.py
+++ b/lms/djangoapps/course_modes/models.py
--- a/lms/djangoapps/course_modes/tests.py
+++ b/lms/djangoapps/course_modes/tests.py
--- a/lms/djangoapps/course_modes/views.py
+++ b/lms/djangoapps/course_modes/views.py