WIP Made coach dashboard available on ccx

.jshintrc

@@ -140,6 +140,7 @@
         "spyOnEvent",
 
         // Miscellaneous globals
-        "JSON"
+        "JSON",
+        "gettext"
     ]
 }

cms/djangoapps/contentstore/__init__.py

@@ -1,2 +0,0 @@
-""" module init will register signal handlers """
-import contentstore.signals

cms/djangoapps/contentstore/context_processors.py

@@ -15,7 +15,7 @@
 
 def doc_url(request=None):  # pylint: disable=unused-argument
     """
-    This function is added in the list of TEMPLATE_CONTEXT_PROCESSORS, which is a django setting for
+    This function is added in the list of TEMPLATES 'context_processors' OPTION, which is a django setting for
     a tuple of callables that take a request object as their argument and return a dictionary of items
     to be merged into the RequestContext.
 

cms/djangoapps/contentstore/courseware_index.py

@@ -7,7 +7,7 @@
 from six import add_metaclass
 
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy, ugettext as _
 from django.core.urlresolvers import resolve
 
 from contentstore.utils import course_image_url
@@ -350,7 +350,7 @@ class CoursewareSearchIndexer(SearchIndexerBase):
         'category': 'courseware_index'
     }
 
-    UNNAMED_MODULE_NAME = _("(Unnamed)")
+    UNNAMED_MODULE_NAME = ugettext_lazy("(Unnamed)")
 
     @classmethod
     def normalize_structure_key(cls, structure_key):
@@ -417,7 +417,7 @@ def supplemental_fields(cls, item):
         while parent is not None:
             path_component_name = parent.display_name
             if not path_component_name:
-                path_component_name = cls.UNNAMED_MODULE_NAME
+                path_component_name = unicode(cls.UNNAMED_MODULE_NAME)
             location_path.append(path_component_name)
             parent = parent.get_parent()
         location_path.reverse()

cms/djangoapps/contentstore/features/advanced_settings.py

@@ -2,7 +2,7 @@
 # pylint: disable=redefined-outer-name
 
 from lettuce import world, step
-from nose.tools import assert_false, assert_equal, assert_regexp_matches  # pylint: disable=no-name-in-module
+from nose.tools import assert_false, assert_equal, assert_regexp_matches
 from common import type_in_codemirror, press_the_notification_button, get_codemirror_value
 
 KEY_CSS = '.key h3.title'

cms/djangoapps/contentstore/features/checklists.py

@@ -2,7 +2,7 @@
 # pylint: disable=redefined-outer-name
 
 from lettuce import world, step
-from nose.tools import assert_true, assert_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_equal
 from selenium.common.exceptions import StaleElementReferenceException
 
 

cms/djangoapps/contentstore/features/common.py

@@ -3,7 +3,7 @@
 
 import os
 from lettuce import world, step
-from nose.tools import assert_true, assert_in  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_in
 from django.conf import settings
 
 from student.roles import CourseStaffRole, CourseInstructorRole, GlobalStaff

cms/djangoapps/contentstore/features/component.py

@@ -6,7 +6,7 @@
 # pylint: disable=unused-argument
 
 from lettuce import world, step
-from nose.tools import assert_true, assert_in, assert_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_in, assert_equal
 
 DISPLAY_NAME = "Display Name"
 

cms/djangoapps/contentstore/features/component_settings_editor_helpers.py

@@ -2,7 +2,7 @@
 # pylint: disable=missing-docstring
 
 from lettuce import world
-from nose.tools import assert_equal, assert_in  # pylint: disable=no-name-in-module
+from nose.tools import assert_equal, assert_in
 from terrain.steps import reload_the_page
 from common import type_in_codemirror
 from selenium.webdriver.common.keys import Keys

cms/djangoapps/contentstore/features/course-outline.py

@@ -3,7 +3,7 @@
 
 from lettuce import world, step
 from common import *
-from nose.tools import assert_true, assert_false  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_false
 
 from logging import getLogger
 logger = getLogger(__name__)

cms/djangoapps/contentstore/features/course-settings.py

@@ -6,7 +6,7 @@
 from common import type_in_codemirror, upload_file
 from django.conf import settings
 
-from nose.tools import assert_true, assert_false  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_false
 
 TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
 

cms/djangoapps/contentstore/features/course-updates.py

@@ -1,10 +1,9 @@
 # pylint: disable=missing-docstring
-# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from selenium.webdriver.common.keys import Keys
 from common import type_in_codemirror, get_codemirror_value
-from nose.tools import assert_in  # pylint: disable=no-name-in-module
+from nose.tools import assert_in
 
 
 @step(u'I go to the course updates page')

cms/djangoapps/contentstore/features/grading.py

@@ -6,7 +6,7 @@
 from terrain.steps import reload_the_page
 from selenium.common.exceptions import InvalidElementStateException
 from contentstore.utils import reverse_course_url
-from nose.tools import assert_in, assert_equal, assert_not_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_in, assert_equal, assert_not_equal
 
 
 @step(u'I am viewing the grading settings')

cms/djangoapps/contentstore/features/html-editor.py

@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 from lettuce import world, step
-from nose.tools import assert_in, assert_false, assert_true, assert_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_in, assert_false, assert_true, assert_equal
 from common import type_in_codemirror, get_codemirror_value
 
 CODEMIRROR_SELECTOR_PREFIX = "$('iframe').contents().find"

cms/djangoapps/contentstore/features/pages.py

@@ -3,7 +3,7 @@
 # pylint: disable=unused-argument
 
 from lettuce import world, step
-from nose.tools import assert_equal, assert_in  # pylint: disable=no-name-in-module
+from nose.tools import assert_equal, assert_in
 
 
 CSS_FOR_TAB_ELEMENT = "li[data-tab-id='{0}'] input.toggle-checkbox"

cms/djangoapps/contentstore/features/problem-editor.py

@@ -3,7 +3,7 @@
 
 import json
 from lettuce import world, step
-from nose.tools import assert_equal, assert_true  # pylint: disable=no-name-in-module
+from nose.tools import assert_equal, assert_true
 from common import type_in_codemirror, open_new_course
 from advanced_settings import change_value, ADVANCED_MODULES_KEY
 from course_import import import_file

cms/djangoapps/contentstore/features/signup.py

@@ -2,7 +2,7 @@
 # pylint: disable=redefined-outer-name
 
 from lettuce import world, step
-from nose.tools import assert_true, assert_false  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_false
 
 
 @step('I fill in the registration form$')

cms/djangoapps/contentstore/features/textbooks.py

@@ -1,5 +1,4 @@
 # pylint: disable=missing-docstring
-# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from django.conf import settings

cms/djangoapps/contentstore/features/upload.py

@@ -10,7 +10,7 @@
 import os
 from django.contrib.auth.models import User
 from student.models import CourseEnrollment
-from nose.tools import assert_equal, assert_not_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_equal, assert_not_equal
 
 TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
 ASSET_NAMES_CSS = 'td.name-col > span.title > a.filename'

cms/djangoapps/contentstore/features/video_editor.py

@@ -4,7 +4,7 @@
 
 import requests
 from lettuce import world, step
-from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal  # pylint: disable=no-name-in-module
+from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal
 from terrain.steps import reload_the_page
 from django.conf import settings
 from common import upload_file, attach_file

cms/djangoapps/contentstore/features/video_handout.py

@@ -3,7 +3,7 @@
 # pylint: disable=missing-docstring
 
 from lettuce import world, step
-from nose.tools import assert_true  # pylint: disable=no-name-in-module
+from nose.tools import assert_true
 from video_editor import RequestHandlerWithSessionId, success_upload_file
 
 

cms/djangoapps/contentstore/management/commands/delete_orphans.py

@@ -11,32 +11,29 @@ class Command(BaseCommand):
     help = '''
     Delete orphans from a MongoDB backed course. Takes two arguments:
     <course_id>: the course id of the course whose orphans you want to delete
-    |commit|: optional argument. If not provided, will not run task.
+    |--commit|: optional argument. If not provided, will dry run delete
     '''
 
-    def handle(self, *args, **options):
-        if len(args) not in {1, 2}:
-            raise CommandError("delete_orphans requires one or more arguments: <course_id> |commit|")
+    def add_arguments(self, parser):
+        parser.add_argument('course_id')
+        parser.add_argument('--commit', action='store_true', help='Commit to deleting the orphans')
 
+    def handle(self, *args, **options):
         try:
-            course_key = CourseKey.from_string(args[0])
+            course_key = CourseKey.from_string(options['course_id'])
         except InvalidKeyError:
             raise CommandError("Invalid course key.")
 
-        commit = False
-        if len(args) == 2:
-            commit = args[1] == 'commit'
-
-        if commit:
+        if options['commit']:
             print 'Deleting orphans from the course:'
             deleted_items = _delete_orphans(
-                course_key, ModuleStoreEnum.UserID.mgmt_command, commit
+                course_key, ModuleStoreEnum.UserID.mgmt_command, options['commit']
             )
             print "Success! Deleted the following orphans from the course:"
             print "\n".join(deleted_items)
         else:
             print 'Dry run. The following orphans would have been deleted from the course:'
             deleted_items = _delete_orphans(
-                course_key, ModuleStoreEnum.UserID.mgmt_command, commit
+                course_key, ModuleStoreEnum.UserID.mgmt_command, options['commit']
             )
             print "\n".join(deleted_items)

cms/djangoapps/contentstore/management/commands/export.py

@@ -18,23 +18,24 @@ class Command(BaseCommand):
     """
     help = 'Export the specified data directory into the default ModuleStore'
 
-    def handle(self, *args, **options):
-        "Execute the command"
-        if len(args) != 2:
-            raise CommandError("export requires two arguments: <course id> <output path>")
+    def add_arguments(self, parser):
+        parser.add_argument('course_id')
+        parser.add_argument('output_path')
 
+    def handle(self, *args, **options):
+        """Execute the command"""
         try:
-            course_key = CourseKey.from_string(args[0])
+            course_key = CourseKey.from_string(options['course_id'])
         except InvalidKeyError:
             try:
-                course_key = SlashSeparatedCourseKey.from_deprecated_string(args[0])
+                course_key = SlashSeparatedCourseKey.from_deprecated_string(options['course_id'])
             except InvalidKeyError:
-                raise CommandError("Invalid course_key: '%s'. " % args[0])
+                raise CommandError("Invalid course_key: '%s'." % options['course_id'])
 
         if not modulestore().get_course(course_key):
-            raise CommandError("Course with %s key not found." % args[0])
+            raise CommandError("Course with %s key not found." % options['course_id'])
 
-        output_path = args[1]
+        output_path = options['output_path']
 
         print "Exporting course id = {0} to {1}".format(course_key, output_path)
 

cms/djangoapps/contentstore/management/commands/fix_not_found.py

@@ -13,12 +13,14 @@ class Command(BaseCommand):
     """Fix a course's item not found errors"""
     help = "Fix a course's ItemNotFound errors"
 
+    def add_arguments(self, parser):
+        parser.add_argument('course_id')
+
     def handle(self, *args, **options):
-        "Execute the command"
-        if len(args) != 1:
-            raise CommandError("requires 1 argument: <course_id>")
+        """Execute the command"""
+        course_id = options.get('course_id', None)
 
-        course_key = CourseKey.from_string(args[0])
+        course_key = CourseKey.from_string(course_id)
         # for now only support on split mongo
         # pylint: disable=protected-access
         owning_store = modulestore()._get_modulestore_for_courselike(course_key)

cms/djangoapps/contentstore/management/commands/force_publish.py

@@ -17,39 +17,37 @@ class Command(BaseCommand):
     help = '''
     Force publish a course. Takes two arguments:
     <course_id>: the course id of the course you want to publish forcefully
-    commit: do the force publish
+    --commit: do the force publish
 
-    If you do not specify 'commit', the command will print out what changes would be made.
+    If you do not specify '--commit', the command will print out what changes would be made.
     '''
 
+    def add_arguments(self, parser):
+        parser.add_argument('course_key', help="ID of the Course to force publish")
+        parser.add_argument('--commit', action='store_true', help="Pull updated metadata from external IDPs")
+
     def handle(self, *args, **options):
         """Execute the command"""
-        if len(args) not in {1, 2}:
-            raise CommandError("force_publish requires 1 or more argument: <course_id> |commit|")
 
         try:
-            course_key = CourseKey.from_string(args[0])
+            course_key = CourseKey.from_string(options['course_key'])
         except InvalidKeyError:
             raise CommandError("Invalid course key.")
 
         if not modulestore().get_course(course_key):
             raise CommandError("Course not found.")
 
-        commit = False
-        if len(args) == 2:
-            commit = args[1] == 'commit'
-
         # for now only support on split mongo
         owning_store = modulestore()._get_modulestore_for_courselike(course_key)  # pylint: disable=protected-access
         if hasattr(owning_store, 'force_publish_course'):
-            versions = get_course_versions(args[0])
+            versions = get_course_versions(options['course_key'])
             print "Course versions : {0}".format(versions)
 
-            if commit:
+            if options['commit']:
                 if query_yes_no("Are you sure to publish the {0} course forcefully?".format(course_key), default="no"):
                     # publish course forcefully
                     updated_versions = owning_store.force_publish_course(
-                        course_key, ModuleStoreEnum.UserID.mgmt_command, commit
+                        course_key, ModuleStoreEnum.UserID.mgmt_command, options['commit']
                     )
                     if updated_versions:
                         # if publish and draft were different

cms/djangoapps/contentstore/management/commands/import.py

@@ -1,8 +1,9 @@
 """
 Script for importing courseware from XML format
 """
+from optparse import make_option
 
-from django.core.management.base import BaseCommand, CommandError, make_option
+from django.core.management.base import BaseCommand, CommandError
 from django_comment_common.utils import (seed_permissions_roles,
                                          are_permissions_roles_seeded)
 from xmodule.modulestore.xml_importer import import_course_from_xml

cms/djangoapps/contentstore/management/commands/tests/test_delete_course.py

@@ -7,8 +7,8 @@
 
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from django.core.management import CommandError
-from contentstore.management.commands.delete_course import Command  # pylint: disable=import-error
-from contentstore.tests.utils import CourseTestCase  # pylint: disable=import-error
+from contentstore.management.commands.delete_course import Command
+from contentstore.tests.utils import CourseTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.django import modulestore