From 85fb7b8ad29e24d6969daf690e005f4fbdee8e43 Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Wed, 11 Jan 2017 14:39:10 -0500
Subject: [PATCH 01/10] add index for modified to course and subsection grades

---
 lms/djangoapps/grades/models.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index e95cda16e0..e53ca6f674 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -253,6 +253,14 @@ class PersistentSubsectionGrade(DeleteGradesMixin, TimeStampedModel):
             # * Course staff can see all grades for a course using (course_id,)
             ('course_id', 'user_id', 'usage_key'),
         ]
+        # Allows querying in the following ways:
+        # (modified): find all the grades updated within a certain timespan
+        # (modified, course_id): find all the grades updated within a timespan for a certain course
+        # (modified, course_id, usage_key): find all the grades updated within a timespan for a subsection
+        #   in a course
+        index_together = [
+            ('modified', 'course_id', 'usage_key')
+        ]
 
     # primary key will need to be large for this table
     id = UnsignedBigIntAutoField(primary_key=True)  # pylint: disable=invalid-name
@@ -502,11 +510,14 @@ class PersistentCourseGrade(DeleteGradesMixin, TimeStampedModel):
         # (course_id) for instructors to see all course grades, implicitly created via the unique_together constraint
         # (user_id) for course dashboard; explicitly declared as an index below
         # (passed_timestamp, course_id) for tracking when users first earned a passing grade.
+        # (modified): find all the grades updated within a certain timespan
+        # (modified, course_id): find all the grades updated within a certain timespan for a course
         unique_together = [
             ('course_id', 'user_id'),
         ]
         index_together = [
             ('passed_timestamp', 'course_id'),
+            ('modified', 'course_id')
         ]
 
     # primary key will need to be large for this table

From 434d4038078b9c919dd536836a0856971d3343fc Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Wed, 11 Jan 2017 15:23:21 -0500
Subject: [PATCH 02/10] forgot migration

---
 .../migrations/0009_auto_20170111_1507.py     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py

diff --git a/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py b/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
new file mode 100644
index 0000000000..d71c45a811
--- /dev/null
+++ b/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grades', '0008_persistentsubsectiongrade_first_attempted'),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name='persistentcoursegrade',
+            index_together=set([('passed_timestamp', 'course_id'), ('modified', 'course_id')]),
+        ),
+        migrations.AlterIndexTogether(
+            name='persistentsubsectiongrade',
+            index_together=set([('modified', 'course_id', 'usage_key')]),
+        ),
+    ]

From 4e6745f3c14039121dc8c352c9e3ef2e54bf8bbf Mon Sep 17 00:00:00 2001
From: Kevin Falcone <kevin@edx.org>
Date: Wed, 11 Jan 2017 16:45:03 -0500
Subject: [PATCH 03/10] These tasks tend to be very short but can queue behind
 grade reports

Here are the 3 tasks over the last 30 days with average duration
runtimes in seconds:

lms.djangoapps.instructor_task.tasks.calculate_students_features_csv 37.794393
lms.djangoapps.instructor_task.tasks.calculate_may_enroll_csv   0.030303
lms.djangoapps.instructor_task.tasks.export_ora2_data   67.629921

All but ora2 seem fine to pass through the default queue, which has 3
workers per physical machine.
---
 lms/djangoapps/instructor_task/tasks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/instructor_task/tasks.py b/lms/djangoapps/instructor_task/tasks.py
index 5a24516701..7ad7cf2a60 100644
--- a/lms/djangoapps/instructor_task/tasks.py
+++ b/lms/djangoapps/instructor_task/tasks.py
@@ -193,7 +193,7 @@ def calculate_problem_grade_report(entry_id, xmodule_instance_args):
     return run_main_task(entry_id, task_fn, action_name)
 
 
-@task(base=BaseInstructorTask, routing_key=settings.GRADES_DOWNLOAD_ROUTING_KEY)  # pylint: disable=not-callable
+@task(base=BaseInstructorTask)  # pylint: disable=not-callable
 def calculate_students_features_csv(entry_id, xmodule_instance_args):
     """
     Compute student profile information for a course and upload the
@@ -252,7 +252,7 @@ def proctored_exam_results_csv(entry_id, xmodule_instance_args):
     return run_main_task(entry_id, task_fn, action_name)
 
 
-@task(base=BaseInstructorTask, routing_key=settings.GRADES_DOWNLOAD_ROUTING_KEY)  # pylint: disable=not-callable
+@task(base=BaseInstructorTask)  # pylint: disable=not-callable
 def calculate_may_enroll_csv(entry_id, xmodule_instance_args):
     """
     Compute information about invited students who have not enrolled
@@ -293,7 +293,7 @@ def cohort_students(entry_id, xmodule_instance_args):
     return run_main_task(entry_id, task_fn, action_name)
 
 
-@task(base=BaseInstructorTask, routing_key=settings.GRADES_DOWNLOAD_ROUTING_KEY)  # pylint: disable=not-callable
+@task(base=BaseInstructorTask)  # pylint: disable=not-callable
 def export_ora2_data(entry_id, xmodule_instance_args):
     """
     Generate a CSV of ora2 responses and push it to S3.

From e1e47793dff29bdb6e6d63ece52f722ced9db43e Mon Sep 17 00:00:00 2001
From: Gregory Martin <greg@edx.org>
Date: Tue, 10 Jan 2017 13:25:28 -0500
Subject: [PATCH 04/10] change help strings

---
 .../lib/xmodule/xmodule/annotatable_module.py |  2 +-
 common/lib/xmodule/xmodule/capa_base.py       |  2 +-
 .../lib/xmodule/xmodule/conditional_module.py |  2 +-
 common/lib/xmodule/xmodule/html_module.py     |  6 ++--
 .../xmodule/xmodule/imageannotation_module.py |  2 +-
 .../xmodule/xmodule/library_content_module.py |  2 +-
 .../xmodule/xmodule/library_root_xblock.py    |  2 +-
 common/lib/xmodule/xmodule/lti_module.py      |  2 +-
 common/lib/xmodule/xmodule/poll_module.py     | 35 +++++++++++++++----
 .../lib/xmodule/xmodule/split_test_module.py  |  2 +-
 .../xmodule/xmodule/tests/test_xml_module.py  |  8 +++--
 .../xmodule/xmodule/textannotation_module.py  |  2 +-
 .../xmodule/video_module/video_xfields.py     |  2 +-
 .../xmodule/xmodule/videoannotation_module.py |  2 +-
 .../lib/xmodule/xmodule/word_cloud_module.py  |  2 +-
 common/lib/xmodule/xmodule/x_module.py        |  9 +++--
 .../xblock_discussion/xblock_discussion.py    |  2 +-
 17 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/common/lib/xmodule/xmodule/annotatable_module.py b/common/lib/xmodule/xmodule/annotatable_module.py
index 338a5fe067..36428d2acb 100644
--- a/common/lib/xmodule/xmodule/annotatable_module.py
+++ b/common/lib/xmodule/xmodule/annotatable_module.py
@@ -39,7 +39,7 @@ class AnnotatableFields(object):
     )
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default=_('Annotation'),
     )
diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index 783687fc8e..d02627af30 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -92,7 +92,7 @@ class CapaFields(object):
     """
     display_name = String(
         display_name=_("Display Name"),
-        help=_("This name appears in the horizontal navigation at the top of the page."),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         # it'd be nice to have a useful default but it screws up other things; so,
         # use display_name_with_default for those
diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/common/lib/xmodule/xmodule/conditional_module.py
index a2fa824079..0c7fc1e9d2 100644
--- a/common/lib/xmodule/xmodule/conditional_module.py
+++ b/common/lib/xmodule/xmodule/conditional_module.py
@@ -27,7 +27,7 @@ class ConditionalFields(object):
     has_children = True
     display_name = String(
         display_name=_("Display Name"),
-        help=_("This name appears in the horizontal navigation at the top of the page."),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default=_('Conditional')
     )
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 903606a5fa..fc310b70d2 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -38,7 +38,7 @@ class HtmlBlock(object):
     """
     display_name = String(
         display_name=_("Display Name"),
-        help=_("This name appears in the horizontal navigation at the top of the page."),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         # it'd be nice to have a useful default but it screws up other things; so,
         # use display_name_with_default for those
@@ -329,7 +329,7 @@ class HtmlDescriptor(HtmlBlock, XmlDescriptor, EditingDescriptor):  # pylint: di
 
 class AboutFields(object):
     display_name = String(
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default="overview",
     )
@@ -364,7 +364,7 @@ class StaticTabFields(object):
     """
     display_name = String(
         display_name=_("Display Name"),
-        help=_("This name appears in the horizontal navigation at the top of the page."),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default="Empty",
     )
diff --git a/common/lib/xmodule/xmodule/imageannotation_module.py b/common/lib/xmodule/xmodule/imageannotation_module.py
index e9d68ebac1..c9b361b84a 100644
--- a/common/lib/xmodule/xmodule/imageannotation_module.py
+++ b/common/lib/xmodule/xmodule/imageannotation_module.py
@@ -45,7 +45,7 @@ class AnnotatableFields(object):
         """))
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default=_('Image Annotation'),
     )
diff --git a/common/lib/xmodule/xmodule/library_content_module.py b/common/lib/xmodule/xmodule/library_content_module.py
index ae46a775b5..cd06b49ec4 100644
--- a/common/lib/xmodule/xmodule/library_content_module.py
+++ b/common/lib/xmodule/xmodule/library_content_module.py
@@ -60,7 +60,7 @@ class LibraryContentFields(object):
     # to locate input elements - keep synchronized
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         default="Randomized Content Block",
         scope=Scope.settings,
     )
diff --git a/common/lib/xmodule/xmodule/library_root_xblock.py b/common/lib/xmodule/xmodule/library_root_xblock.py
index 6c9466d889..f546f2f14a 100644
--- a/common/lib/xmodule/xmodule/library_root_xblock.py
+++ b/common/lib/xmodule/xmodule/library_root_xblock.py
@@ -25,7 +25,7 @@ class LibraryRoot(XBlock):
     resources_dir = None
 
     display_name = String(
-        help=_("Enter the name of the library as it should appear in Studio."),
+        help=_("The display name for this component."),
         default="Library",
         display_name=_("Library Display Name"),
         scope=Scope.settings
diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py
index df02c6ce9c..84153f621c 100644
--- a/common/lib/xmodule/xmodule/lti_module.py
+++ b/common/lib/xmodule/xmodule/lti_module.py
@@ -109,7 +109,7 @@ class LTIFields(object):
     display_name = String(
         display_name=_("Display Name"),
         help=_(
-            "Enter the name that students see for this component.  "
+            "The display name for this component. "
             "Analytics reports may also use the display name to identify this component."
         ),
         scope=Scope.settings,
diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py
index 9b86d01ab2..a39cd34a9a 100644
--- a/common/lib/xmodule/xmodule/poll_module.py
+++ b/common/lib/xmodule/xmodule/poll_module.py
@@ -23,20 +23,43 @@ from xmodule.xml_module import XmlDescriptor
 from xblock.fields import Scope, String, Dict, Boolean, List
 
 log = logging.getLogger(__name__)
+_ = lambda text: text
 
 
 class PollFields(object):
     # Name of poll to use in links to this poll
-    display_name = String(help="Display name for this module", scope=Scope.settings)
+    display_name = String(
+        help=_("The display name for this component."),
+        scope=Scope.settings
+    )
 
-    voted = Boolean(help="Whether this student has voted on the poll", scope=Scope.user_state, default=False)
-    poll_answer = String(help="Student answer", scope=Scope.user_state, default='')
-    poll_answers = Dict(help="Poll answers from all students", scope=Scope.user_state_summary)
+    voted = Boolean(
+        help=_("Whether this student has voted on the poll"),
+        scope=Scope.user_state,
+        default=False
+    )
+    poll_answer = String(
+        help=_("Student answer"),
+        scope=Scope.user_state,
+        default=''
+    )
+    poll_answers = Dict(
+        help=_("Poll answers from all students"),
+        scope=Scope.user_state_summary
+    )
 
     # List of answers, in the form {'id': 'some id', 'text': 'the answer text'}
-    answers = List(help="Poll answers from xml", scope=Scope.content, default=[])
+    answers = List(
+        help=_("Poll answers from xml"),
+        scope=Scope.content,
+        default=[]
+    )
 
-    question = String(help="Poll question", scope=Scope.content, default='')
+    question = String(
+        help=_("Poll question"),
+        scope=Scope.content,
+        default=''
+    )
 
 
 class PollModule(PollFields, XModule):
diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/common/lib/xmodule/xmodule/split_test_module.py
index eb127297f8..144460590e 100644
--- a/common/lib/xmodule/xmodule/split_test_module.py
+++ b/common/lib/xmodule/xmodule/split_test_module.py
@@ -58,7 +58,7 @@ class SplitTestFields(object):
 
     display_name = String(
         display_name=_("Display Name"),
-        help=_("This name is used for organizing your course content, but is not shown to students."),
+        help=_("The display name for this component. (Not shown to learners)"),
         scope=Scope.settings,
         default=_("Content Experiment")
     )
diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py
index dcc0f2310d..290d5b1000 100644
--- a/common/lib/xmodule/xmodule/tests/test_xml_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py
@@ -37,8 +37,12 @@ class TestFields(object):
     # Will not be returned by editable_metadata_fields because is not Scope.settings.
     student_answers = Dict(scope=Scope.user_state)
     # Will be returned, and can override the inherited value from XModule.
-    display_name = String(scope=Scope.settings, default='local default', display_name='Local Display Name',
-                          help='local help')
+    display_name = String(
+        scope=Scope.settings,
+        default='local default',
+        display_name='Local Display Name',
+        help='local help'
+    )
     # Used for testing select type, effect of to_json method
     string_select = CrazyJsonString(
         scope=Scope.settings,
diff --git a/common/lib/xmodule/xmodule/textannotation_module.py b/common/lib/xmodule/xmodule/textannotation_module.py
index dfcae252be..beff2b8454 100644
--- a/common/lib/xmodule/xmodule/textannotation_module.py
+++ b/common/lib/xmodule/xmodule/textannotation_module.py
@@ -34,7 +34,7 @@ class AnnotatableFields(object):
         """))
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default=_('Text Annotation'),
     )
diff --git a/common/lib/xmodule/xmodule/video_module/video_xfields.py b/common/lib/xmodule/xmodule/video_module/video_xfields.py
index a24fe56206..cec0036391 100644
--- a/common/lib/xmodule/xmodule/video_module/video_xfields.py
+++ b/common/lib/xmodule/xmodule/video_module/video_xfields.py
@@ -14,7 +14,7 @@ _ = lambda text: text
 class VideoFields(object):
     """Fields for `VideoModule` and `VideoDescriptor`."""
     display_name = String(
-        help=_("The name students see. This name appears in the course ribbon and as a header for the video."),
+        help=_("The display name for this component."),
         display_name=_("Component Display Name"),
         default="Video",
         scope=Scope.settings
diff --git a/common/lib/xmodule/xmodule/videoannotation_module.py b/common/lib/xmodule/xmodule/videoannotation_module.py
index 945d676594..30ad2bfdf7 100644
--- a/common/lib/xmodule/xmodule/videoannotation_module.py
+++ b/common/lib/xmodule/xmodule/videoannotation_module.py
@@ -34,7 +34,7 @@ class AnnotatableFields(object):
         """))
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this module"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default=_('Video Annotation'),
     )
diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py
index 6e12843efb..e80c556d8f 100644
--- a/common/lib/xmodule/xmodule/word_cloud_module.py
+++ b/common/lib/xmodule/xmodule/word_cloud_module.py
@@ -38,7 +38,7 @@ class WordCloudFields(object):
     """XFields for word cloud."""
     display_name = String(
         display_name=_("Display Name"),
-        help=_("The label for this word cloud on the course page."),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         default="Word cloud"
     )
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 1a3df2e956..7e707f4884 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -66,6 +66,11 @@ STUDIO_VIEW = 'studio_view'
 PREVIEW_VIEWS = [STUDENT_VIEW, AUTHOR_VIEW]
 
 
+# Make '_' a no-op so we can scrape strings. Using lambda instead of
+#  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file
+_ = lambda text: text
+
+
 class OpaqueKeyReader(IdReader):
     """
     IdReader for :class:`DefinitionKey` and :class:`UsageKey`s.
@@ -256,8 +261,8 @@ class XModuleFields(object):
     Common fields for XModules.
     """
     display_name = String(
-        display_name="Display Name",
-        help="This name appears in the horizontal navigation at the top of the page.",
+        display_name=_("Display Name"),
+        help=_("The display name for this component."),
         scope=Scope.settings,
         # it'd be nice to have a useful default but it screws up other things; so,
         # use display_name_with_default for those
diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
index 14f83f8c81..44341eef53 100644
--- a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
+++ b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
@@ -39,7 +39,7 @@ class DiscussionXBlock(XBlock, StudioEditableXBlockMixin, XmlParserMixin):
     discussion_id = String(scope=Scope.settings, default=UNIQUE_ID)
     display_name = String(
         display_name=_("Display Name"),
-        help=_("Display name for this component"),
+        help=_("The display name for this component."),
         default="Discussion",
         scope=Scope.settings
     )

From 6845c64977bf9c57614475ca3608c3ab49c91e9f Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Tue, 27 Dec 2016 16:56:11 -0500
Subject: [PATCH 05/10] Hide after course end

Hijacks the existing hide_after_due field to be repected as "hide after course
end" for self-paced courses. Includes tests.

TNL-6108
---
 cms/djangoapps/contentstore/views/item.py     |   1 +
 .../js/views/modals/course_outline_modals.js  |   5 +-
 .../js/content-visibility-editor.underscore   |  16 ++-
 cms/templates/js/course-outline.underscore    |   7 +-
 common/lib/xmodule/xmodule/seq_module.py      |  32 ++---
 .../xmodule/xmodule/tests/test_sequence.py    | 133 +++++++++---------
 .../test/acceptance/pages/lms/courseware.py   |   4 +-
 .../transformers/hidden_content.py            |  14 +-
 lms/djangoapps/courseware/tests/test_views.py |   2 +-
 lms/templates/hidden_content.html             |  49 ++++---
 10 files changed, 151 insertions(+), 112 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index df448141fd..f1789eeff8 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -981,6 +981,7 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
         "release_date": release_date,
         "visibility_state": visibility_state,
         "has_explicit_staff_lock": xblock.fields['visible_to_staff_only'].is_set_on(xblock),
+        "self_paced": is_self_paced(course),
         "start": xblock.fields['start'].to_json(xblock.start),
         "graded": xblock.graded,
         "due_date": get_default_time_display(xblock.due),
diff --git a/cms/static/js/views/modals/course_outline_modals.js b/cms/static/js/views/modals/course_outline_modals.js
index 281c4243d3..8bfe529220 100644
--- a/cms/static/js/views/modals/course_outline_modals.js
+++ b/cms/static/js/views/modals/course_outline_modals.js
@@ -712,7 +712,10 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
             return $.extend(
                 {},
                 AbstractVisibilityEditor.prototype.getContext.call(this),
-                {hide_after_due: this.modelVisibility() === 'hide_after_due'}
+                {
+                    hide_after_due: this.modelVisibility() === 'hide_after_due',
+                    self_paced: this.model.get('self_paced') === true
+                }
             );
         }
     });
diff --git a/cms/templates/js/content-visibility-editor.underscore b/cms/templates/js/content-visibility-editor.underscore
index e80830ecd0..e66ae634c8 100644
--- a/cms/templates/js/content-visibility-editor.underscore
+++ b/cms/templates/js/content-visibility-editor.underscore
@@ -12,9 +12,19 @@
         <li class="field-radio">
             <label class="label">
                 <input class="input input-radio" name="content-visibility" type="radio" value="hide_after_due" aria-described-by="hide_after_due_description">
-                <%- gettext('Hide content after due date') %>
+                <% if (self_paced) { %>
+                    <%- gettext('Hide content after course end date') %>
+                <% } else { %>
+                    <%- gettext('Hide content after due date') %>
+                <% } %>
             </label>
-            <p class='field-message' id='hide_after_due_description'> <%- gettext('After the subsection\'s due date has passed, learners can no longer access its content. The subsection remains included in grade calculations.') %> </p>
+            <p class='field-message' id='hide_after_due_description'>
+                <% if (self_paced) { %>
+                    <%- gettext('After the course\'s end date has passed, learners can no longer access subsection content. The subsection remains included in grade calculations.') %>
+                <% } else { %>
+                    <%- gettext('After the subsection\'s due date has passed, learners can no longer access its content. The subsection remains included in grade calculations.') %>
+                <% } %>
+            </p>
         </li>
         <li class="field-radio">
             <label class="label">
@@ -29,7 +39,7 @@
     <% if (hasExplicitStaffLock && !ancestorLocked) { %>
         <p class="tip tip-warning">
             <%- interpolate(
-                gettext('If you select an option other than "%(hide_label)s", after the subsection release date has passed, published units in this subsection will become available to learners unless units are explicitly hidden.'),
+                gettext('If you select an option other than "%(hide_label)s", published units in this subsection become available to learners unless they are explicitly hidden.'),
                 { hide_label: hide_label },
                 true
             ) %>
diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore
index 383176314c..4e1418a658 100644
--- a/cms/templates/js/course-outline.underscore
+++ b/cms/templates/js/course-outline.underscore
@@ -201,7 +201,12 @@ if (is_proctored_exam) {
                 <p>
                     <% if (xblockInfo.get('hide_after_due')) { %>
                         <span class="icon fa fa-eye-slash" aria-hidden="true"></span>
-                        <span class="status-hide-after-due-value"> <%- gettext("Subsection is hidden after due date") %> </span>
+                        <span class="status-hide-after-due-value">
+                        <% if (course.get('self_paced')) { %>
+                            <%- gettext("Subsection is hidden after course end date") %> </span>
+                        <% } else { %>
+                            <%- gettext("Subsection is hidden after due date") %> </span>
+                        <% } %>
                     <% } %>
                 </p>
             </div>
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index ca588eee33..8233f2a669 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -202,16 +202,16 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
         raise NotFoundError('Unexpected dispatch type')
 
     @classmethod
-    def verify_current_content_visibility(cls, due, hide_after_due):
+    def verify_current_content_visibility(cls, date, hide_after_date):
         """
         Returns whether the content visibility policy passes
-        for the given due date and hide_after_due values and
+        for the given date and hide_after_date values and
         the current date-time.
         """
         return (
-            not due or
-            not hide_after_due or
-            datetime.now(UTC()) < due
+            not date or
+            not hide_after_date or
+            datetime.now(UTC()) < date
         )
 
     def student_view(self, context):
@@ -246,20 +246,17 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
         runtime user. If so, returns a banner_text or the fragment to
         display depending on whether staff is masquerading.
         """
-        if not self._can_user_view_content():
-            subsection_format = (self.format or _("subsection")).lower()  # pylint: disable=no-member
-
-            # Translators: subsection_format refers to the assignment
-            # type of the subsection, such as Homework, Lab, Exam, etc.
-            banner_text = _(
-                "Because the due date has passed, "
-                "this {subsection_format} is hidden from the learner."
-            ).format(subsection_format=subsection_format)
+        course = self._get_course()
+        if not self._can_user_view_content(course):
+            if course.self_paced:
+                banner_text = _("Because the course has ended, this assignment is hidden from the learner.")
+            else:
+                banner_text = _("Because the due date has passed, this assignment is hidden from the learner.")
 
             hidden_content_html = self.system.render_template(
                 'hidden_content.html',
                 {
-                    'subsection_format': subsection_format,
+                    'self_paced': course.self_paced,
                     'progress_url': context.get('progress_url'),
                 }
             )
@@ -280,14 +277,15 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
             if content_milestones and self.runtime.user_is_staff:
                 return banner_text
 
-    def _can_user_view_content(self):
+    def _can_user_view_content(self, course):
         """
         Returns whether the runtime user can view the content
         of this sequential.
         """
+        hidden_date = course.end if course.self_paced else self.due
         return (
             self.runtime.user_is_staff or
-            self.verify_current_content_visibility(self.due, self.hide_after_due)
+            self.verify_current_content_visibility(hidden_date, self.hide_after_due)
         )
 
     def _student_view(self, context, banner_text=None):
diff --git a/common/lib/xmodule/xmodule/tests/test_sequence.py b/common/lib/xmodule/xmodule/tests/test_sequence.py
index 5643ada5ca..26112a6110 100644
--- a/common/lib/xmodule/xmodule/tests/test_sequence.py
+++ b/common/lib/xmodule/xmodule/tests/test_sequence.py
@@ -3,49 +3,46 @@ Tests for sequence module.
 """
 # pylint: disable=no-member
 from datetime import timedelta
-import ddt
 from django.utils.timezone import now
 from freezegun import freeze_time
-from mock import Mock
+from mock import Mock, patch
+from xmodule.seq_module import SequenceModule
 from xmodule.tests import get_test_system
 from xmodule.tests.helpers import StubUserService
-from xmodule.tests.xml import XModuleXmlImportTest
-from xmodule.tests.xml import factories as xml
+from xmodule.tests.xml import factories as xml, XModuleXmlImportTest
 from xmodule.x_module import STUDENT_VIEW
-from xmodule.seq_module import SequenceModule
+
+TODAY = now()
+DUE_DATE = TODAY + timedelta(days=7)
+PAST_DUE_BEFORE_END_DATE = TODAY + timedelta(days=14)
+COURSE_END_DATE = TODAY + timedelta(days=21)
 
 
-@ddt.ddt
 class SequenceBlockTestCase(XModuleXmlImportTest):
     """
-    Tests for the Sequence Module.
+    Base class for tests of Sequence Module.
     """
-    TODAY = now()
-    TOMORROW = TODAY + timedelta(days=1)
-    DAY_AFTER_TOMORROW = TOMORROW + timedelta(days=1)
+    def setUp(self):
+        super(SequenceBlockTestCase, self).setUp()
 
-    @classmethod
-    def setUpClass(cls):
-        super(SequenceBlockTestCase, cls).setUpClass()
+        course_xml = self._set_up_course_xml()
+        self.course = self.process_xml(course_xml)
+        self._set_up_module_system(self.course)
 
-        course_xml = cls._set_up_course_xml()
-        cls.course = cls.process_xml(course_xml)
-        cls._set_up_module_system(cls.course)
-
-        for chapter_index in range(len(cls.course.get_children())):
-            chapter = cls._set_up_block(cls.course, chapter_index)
-            setattr(cls, 'chapter_{}'.format(chapter_index + 1), chapter)
+        for chapter_index in range(len(self.course.get_children())):
+            chapter = self._set_up_block(self.course, chapter_index)
+            setattr(self, 'chapter_{}'.format(chapter_index + 1), chapter)
 
             for sequence_index in range(len(chapter.get_children())):
-                sequence = cls._set_up_block(chapter, sequence_index)
-                setattr(cls, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
+                sequence = self._set_up_block(chapter, sequence_index)
+                setattr(self, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
 
-    @classmethod
-    def _set_up_course_xml(cls):
+    @staticmethod
+    def _set_up_course_xml():
         """
         Sets up and returns XML course structure.
         """
-        course = xml.CourseFactory.build()
+        course = xml.CourseFactory.build(end=str(COURSE_END_DATE))
 
         chapter_1 = xml.ChapterFactory.build(parent=course)  # has 2 child sequences
         xml.ChapterFactory.build(parent=course)  # has 0 child sequences
@@ -58,7 +55,7 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         xml.SequenceFactory.build(  # sequence_4_1
             parent=chapter_4,
             hide_after_due=str(True),
-            due=str(cls.TOMORROW),
+            due=str(DUE_DATE),
         )
 
         for _ in range(3):
@@ -66,14 +63,13 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
 
         return course
 
-    @classmethod
-    def _set_up_block(cls, parent, index_in_parent):
+    def _set_up_block(self, parent, index_in_parent):
         """
         Sets up the stub sequence module for testing.
         """
         block = parent.get_children()[index_in_parent]
 
-        cls._set_up_module_system(block)
+        self._set_up_module_system(block)
 
         block.xmodule_runtime._services['bookmarks'] = Mock()  # pylint: disable=protected-access
         block.xmodule_runtime._services['user'] = StubUserService()  # pylint: disable=protected-access
@@ -81,8 +77,7 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         block.parent = parent.location
         return block
 
-    @classmethod
-    def _set_up_module_system(cls, block):
+    def _set_up_module_system(self, block):
         """
         Sets up the test module system for the given block.
         """
@@ -90,6 +85,28 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         module_system.descriptor_runtime = block._runtime  # pylint: disable=protected-access
         block.xmodule_runtime = module_system
 
+    def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None, self_paced=False):
+        """
+        Returns the rendered student view for the given sequence and the
+        requested_child parameter.
+        """
+        context = {'requested_child': requested_child}
+        if extra_context:
+            context.update(extra_context)
+
+        # The render operation will ask modulestore for the current course to get some data. As these tests were
+        # originally not written to be compatible with a real modulestore, we've mocked out the relevant return values.
+        with patch.object(SequenceModule, '_get_course') as mock_course:
+            self.course.self_paced = self_paced
+            mock_course.return_value = self.course
+            return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
+
+    def _assert_view_at_position(self, rendered_html, expected_position):
+        """
+        Verifies that the rendered view contains the expected position.
+        """
+        self.assertIn("'position': {}".format(expected_position), rendered_html)
+
     def test_student_view_init(self):
         seq_module = SequenceModule(runtime=Mock(position=2), descriptor=Mock(), scope_ids=Mock())
         self.assertEquals(seq_module.position, 2)  # matches position set in the runtime
@@ -112,22 +129,6 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         html = self._get_rendered_student_view(self.sequence_3_1, requested_child='last')
         self._assert_view_at_position(html, expected_position=3)
 
-    def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None):
-        """
-        Returns the rendered student view for the given sequence and the
-        requested_child parameter.
-        """
-        context = {'requested_child': requested_child}
-        if extra_context:
-            context.update(extra_context)
-        return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
-
-    def _assert_view_at_position(self, rendered_html, expected_position):
-        """
-        Verifies that the rendered view contains the expected position.
-        """
-        self.assertIn("'position': {}".format(expected_position), rendered_html)
-
     def test_tooltip(self):
         html = self._get_rendered_student_view(self.sequence_3_1, requested_child=None)
         for child in self.sequence_3_1.children:
@@ -138,26 +139,18 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         self.assertIn("seq_module.html", html)
         self.assertIn("'banner_text': None", html)
 
-    @freeze_time(DAY_AFTER_TOMORROW)
-    @ddt.data(
-        (None, 'subsection'),
-        ('Homework', 'homework'),
-    )
-    @ddt.unpack
-    def test_hidden_content_past_due(self, format_type, expected_text):
+    @freeze_time(COURSE_END_DATE)
+    def test_hidden_content_past_due(self):
         progress_url = 'http://test_progress_link'
-        self._set_sequence_format(self.sequence_4_1, format_type)
         html = self._get_rendered_student_view(
             self.sequence_4_1,
             extra_context=dict(progress_url=progress_url),
         )
         self.assertIn("hidden_content.html", html)
         self.assertIn(progress_url, html)
-        self.assertIn("'subsection_format': '{}'".format(expected_text), html)
 
-    @freeze_time(DAY_AFTER_TOMORROW)
+    @freeze_time(COURSE_END_DATE)
     def test_masquerade_hidden_content_past_due(self):
-        self._set_sequence_format(self.sequence_4_1, "Homework")
         html = self._get_rendered_student_view(
             self.sequence_4_1,
             extra_context=dict(specific_masquerade=True),
@@ -165,13 +158,23 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         self.assertIn("seq_module.html", html)
         self.assertIn(
             "'banner_text': 'Because the due date has passed, "
-            "this homework is hidden from the learner.'",
+            "this assignment is hidden from the learner.'",
             html
         )
 
-    def _set_sequence_format(self, sequence, format_type):
-        """
-        Sets the format field on the given sequence to the
-        given value.
-        """
-        sequence._xmodule.format = format_type  # pylint: disable=protected-access
+    @freeze_time(PAST_DUE_BEFORE_END_DATE)
+    def test_hidden_content_self_paced_past_due_before_end(self):
+        html = self._get_rendered_student_view(self.sequence_4_1, self_paced=True)
+        self.assertIn("seq_module.html", html)
+        self.assertIn("'banner_text': None", html)
+
+    @freeze_time(COURSE_END_DATE + timedelta(days=7))
+    def test_hidden_content_self_paced_past_end(self):
+        progress_url = 'http://test_progress_link'
+        html = self._get_rendered_student_view(
+            self.sequence_4_1,
+            extra_context=dict(progress_url=progress_url),
+            self_paced=True,
+        )
+        self.assertIn("hidden_content.html", html)
+        self.assertIn(progress_url, html)
diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py
index d3826372ca..ef5381a49b 100644
--- a/common/test/acceptance/pages/lms/courseware.py
+++ b/common/test/acceptance/pages/lms/courseware.py
@@ -209,13 +209,13 @@ class CoursewarePage(CoursePage):
         """
         return self.q(css="div.proctored-exam.completed").visible
 
-    def content_hidden_past_due_date(self, content_type="subsection"):
+    def content_hidden_past_due_date(self):
         """
         Returns whether the "the due date for this ___ has passed" message is present.
         ___ is the type of the hidden content, and defaults to subsection.
         This being true implies "the ___ contents are hidden because their due date has passed".
         """
-        message = "The due date for this {0} has passed.".format(content_type)
+        message = "this assignment is no longer available"
         if self.q(css="div.seq_content").is_present():
             return False
         for html in self.q(css="div.hidden-content").html:
diff --git a/lms/djangoapps/course_blocks/transformers/hidden_content.py b/lms/djangoapps/course_blocks/transformers/hidden_content.py
index 4e1597513e..3f2e2275c2 100644
--- a/lms/djangoapps/course_blocks/transformers/hidden_content.py
+++ b/lms/djangoapps/course_blocks/transformers/hidden_content.py
@@ -25,7 +25,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
 
     Staff users are exempted from hidden content rules.
     """
-    VERSION = 1
+    VERSION = 2
     MERGED_DUE_DATE = 'merged_due_date'
     MERGED_HIDE_AFTER_DUE = 'merged_hide_after_due'
 
@@ -41,7 +41,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
     def _get_merged_hide_after_due(cls, block_structure, block_key):
         """
         Returns whether the block with the given block_key in the
-        given block_structure should be visible to staff only per
+        given block_structure should be hidden after due date per
         computed value from ancestry chain.
         """
         return block_structure.get_transformer_block_field(
@@ -81,6 +81,8 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
             func_merge_ancestors=min,
         )
 
+        block_structure.request_xblock_fields(u'self_paced', u'end')
+
     def transform_block_filters(self, usage_info, block_structure):
         # Users with staff access bypass the Visibility check.
         if usage_info.has_staff_access:
@@ -97,6 +99,10 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
         Returns whether the block with the given block_key should
         be hidden, given the current time.
         """
-        due = self._get_merged_due_date(block_structure, block_key)
         hide_after_due = self._get_merged_hide_after_due(block_structure, block_key)
-        return not SequenceModule.verify_current_content_visibility(due, hide_after_due)
+        self_paced = block_structure[block_structure.root_block_usage_key].self_paced
+        if self_paced:
+            hidden_date = block_structure[block_structure.root_block_usage_key].end
+        else:
+            hidden_date = self._get_merged_due_date(block_structure, block_key)
+        return not SequenceModule.verify_current_content_visibility(hidden_date, hide_after_due)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 43d3f7e400..1bc2a72fdc 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -199,7 +199,7 @@ class IndexQueryTestCase(ModuleStoreTestCase):
     NUM_PROBLEMS = 20
 
     @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 8),
+        (ModuleStoreEnum.Type.mongo, 9),
         (ModuleStoreEnum.Type.split, 4),
     )
     @ddt.unpack
diff --git a/lms/templates/hidden_content.html b/lms/templates/hidden_content.html
index 7e6f4b5c04..33d7b79a7e 100644
--- a/lms/templates/hidden_content.html
+++ b/lms/templates/hidden_content.html
@@ -5,22 +5,35 @@ from openedx.core.djangolib.markup import HTML, Text
 %>
 
 <div class="sequence hidden-content proctored-exam completed">
-  <h3>
-      ${_("The due date for this {subsection_format} has passed.").format(
-        subsection_format=subsection_format,
-      )}
-  </h3>
-  <hr>
-  <p>
-      ${Text(_(
-          "Because the due date has passed, this {subsection_format} "
-          "is no longer available.{line_break}If you have completed this {subsection_format}, "
-          "your grade is available on the {link_start}progress page{link_end}."
-        )).format(
-          subsection_format=subsection_format,
-          line_break=HTML("<br>"),
-          link_start=HTML("<a href='{}'>").format(progress_url),
-          link_end=HTML("</a>"),
-      )}
-  </p>
+    <h3>
+        % if self_paced:
+            ${_("The course has ended.")}
+        % else:
+            ${_("The due date for this assignment has passed.")}
+        % endif
+    </h3>
+    <hr>
+    <p>
+        % if self_paced:
+            ${Text(_(
+                "Because the course has ended, this assignment is no longer "
+                "available.{line_break}If you have completed this assignment, your "
+                "grade is available on the {link_start}progress page{link_end}."
+            )).format(
+                line_break=HTML("<br>"),
+                link_start=HTML("<a href='{}'>").format(progress_url),
+                link_end=HTML("</a>"),
+            )}
+        % else:
+            ${Text(_(
+                "Because the due date has passed, this assignment is no longer "
+                "available.{line_break}If you have completed this assignment, your "
+                "grade is available on the {link_start}progress page{link_end}."
+            )).format(
+                line_break=HTML("<br>"),
+                link_start=HTML("<a href='{}'>").format(progress_url),
+                link_end=HTML("</a>"),
+            )}
+        % endif
+    </p>
 </div>

From f76f9d3b09cd616afaf39b4b9896429293b2a5c3 Mon Sep 17 00:00:00 2001
From: Andy Armstrong <andya@edx.org>
Date: Tue, 3 Jan 2017 18:40:20 -0500
Subject: [PATCH 06/10] Update edx-proctoring to latest release (0.17.0)

---
 requirements/edx/github.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 84c7cc2e1d..9789011ba4 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -91,7 +91,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.3#egg=xblock-utils==1.0.3
 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5
 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1
 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.0#egg=xblock-lti-consumer==1.1.0
-git+https://github.com/edx/edx-proctoring.git@0.16.2#egg=edx-proctoring==0.16.2
+git+https://github.com/edx/edx-proctoring.git@0.17.0#egg=edx-proctoring==0.17.0
 
 # Third Party XBlocks
 -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga

From c07f6405b988e18ca3e9c8b19faea780d7ec649a Mon Sep 17 00:00:00 2001
From: sanfordstudent <sstudent@edx.org>
Date: Thu, 12 Jan 2017 10:54:35 -0500
Subject: [PATCH 07/10] Revert "add index for modified to course and subsection
 grades"

---
 .../migrations/0009_auto_20170111_1507.py     | 22 -------------------
 lms/djangoapps/grades/models.py               | 11 ----------
 2 files changed, 33 deletions(-)
 delete mode 100644 lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py

diff --git a/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py b/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
deleted file mode 100644
index d71c45a811..0000000000
--- a/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('grades', '0008_persistentsubsectiongrade_first_attempted'),
-    ]
-
-    operations = [
-        migrations.AlterIndexTogether(
-            name='persistentcoursegrade',
-            index_together=set([('passed_timestamp', 'course_id'), ('modified', 'course_id')]),
-        ),
-        migrations.AlterIndexTogether(
-            name='persistentsubsectiongrade',
-            index_together=set([('modified', 'course_id', 'usage_key')]),
-        ),
-    ]
diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index e53ca6f674..e95cda16e0 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -253,14 +253,6 @@ class PersistentSubsectionGrade(DeleteGradesMixin, TimeStampedModel):
             # * Course staff can see all grades for a course using (course_id,)
             ('course_id', 'user_id', 'usage_key'),
         ]
-        # Allows querying in the following ways:
-        # (modified): find all the grades updated within a certain timespan
-        # (modified, course_id): find all the grades updated within a timespan for a certain course
-        # (modified, course_id, usage_key): find all the grades updated within a timespan for a subsection
-        #   in a course
-        index_together = [
-            ('modified', 'course_id', 'usage_key')
-        ]
 
     # primary key will need to be large for this table
     id = UnsignedBigIntAutoField(primary_key=True)  # pylint: disable=invalid-name
@@ -510,14 +502,11 @@ class PersistentCourseGrade(DeleteGradesMixin, TimeStampedModel):
         # (course_id) for instructors to see all course grades, implicitly created via the unique_together constraint
         # (user_id) for course dashboard; explicitly declared as an index below
         # (passed_timestamp, course_id) for tracking when users first earned a passing grade.
-        # (modified): find all the grades updated within a certain timespan
-        # (modified, course_id): find all the grades updated within a certain timespan for a course
         unique_together = [
             ('course_id', 'user_id'),
         ]
         index_together = [
             ('passed_timestamp', 'course_id'),
-            ('modified', 'course_id')
         ]
 
     # primary key will need to be large for this table

From 00471d4a789d040957d08ebc9ffdb9c0ff84a733 Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Wed, 11 Jan 2017 14:39:10 -0500
Subject: [PATCH 08/10] add index for modified to course and subsection grades
 and first attempted for subsection for TNL-6281

---
 .../migrations/0009_auto_20170111_1507.py     | 22 +++++++++++++++++++
 .../migrations/0010_auto_20170112_1156.py     | 18 +++++++++++++++
 lms/djangoapps/grades/models.py               | 14 ++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
 create mode 100644 lms/djangoapps/grades/migrations/0010_auto_20170112_1156.py

diff --git a/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py b/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
new file mode 100644
index 0000000000..d71c45a811
--- /dev/null
+++ b/lms/djangoapps/grades/migrations/0009_auto_20170111_1507.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grades', '0008_persistentsubsectiongrade_first_attempted'),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name='persistentcoursegrade',
+            index_together=set([('passed_timestamp', 'course_id'), ('modified', 'course_id')]),
+        ),
+        migrations.AlterIndexTogether(
+            name='persistentsubsectiongrade',
+            index_together=set([('modified', 'course_id', 'usage_key')]),
+        ),
+    ]
diff --git a/lms/djangoapps/grades/migrations/0010_auto_20170112_1156.py b/lms/djangoapps/grades/migrations/0010_auto_20170112_1156.py
new file mode 100644
index 0000000000..39cf1fdf49
--- /dev/null
+++ b/lms/djangoapps/grades/migrations/0010_auto_20170112_1156.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grades', '0009_auto_20170111_1507'),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name='persistentsubsectiongrade',
+            index_together=set([('modified', 'course_id', 'usage_key'), ('first_attempted', 'course_id', 'user_id')]),
+        ),
+    ]
diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index e95cda16e0..cb21a7539a 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -253,6 +253,17 @@ class PersistentSubsectionGrade(DeleteGradesMixin, TimeStampedModel):
             # * Course staff can see all grades for a course using (course_id,)
             ('course_id', 'user_id', 'usage_key'),
         ]
+        # Allows querying in the following ways:
+        # (modified): find all the grades updated within a certain timespan
+        # (modified, course_id): find all the grades updated within a timespan for a certain course
+        # (modified, course_id, usage_key): find all the grades updated within a timespan for a subsection
+        #   in a course
+        # (first_attempted, course_id, user_id): find all attempted subsections in a course for a user
+        # (first_attempted, course_id): find all attempted subsections in a course for all users
+        index_together = [
+            ('modified', 'course_id', 'usage_key'),
+            ('first_attempted', 'course_id', 'user_id')
+        ]
 
     # primary key will need to be large for this table
     id = UnsignedBigIntAutoField(primary_key=True)  # pylint: disable=invalid-name
@@ -502,11 +513,14 @@ class PersistentCourseGrade(DeleteGradesMixin, TimeStampedModel):
         # (course_id) for instructors to see all course grades, implicitly created via the unique_together constraint
         # (user_id) for course dashboard; explicitly declared as an index below
         # (passed_timestamp, course_id) for tracking when users first earned a passing grade.
+        # (modified): find all the grades updated within a certain timespan
+        # (modified, course_id): find all the grades updated within a certain timespan for a course
         unique_together = [
             ('course_id', 'user_id'),
         ]
         index_together = [
             ('passed_timestamp', 'course_id'),
+            ('modified', 'course_id')
         ]
 
     # primary key will need to be large for this table

From 0b620ebbc1732105eba121bb8b2241615f31b77b Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Thu, 12 Jan 2017 13:50:05 -0500
Subject: [PATCH 09/10] Revert "Merge pull request #14225 from
 edx/efischer/tnl-6108"

This reverts commit 8b8cf5f9e03a7baf8651448d91b93294d35dd5a4, reversing
changes made to 2716ffbf8edb8fa957e1aa5f9afd242a4a44c390.
---
 cms/djangoapps/contentstore/views/item.py     |   1 -
 .../js/views/modals/course_outline_modals.js  |   5 +-
 .../js/content-visibility-editor.underscore   |  16 +--
 cms/templates/js/course-outline.underscore    |   7 +-
 common/lib/xmodule/xmodule/seq_module.py      |  32 +++--
 .../xmodule/xmodule/tests/test_sequence.py    | 133 +++++++++---------
 .../test/acceptance/pages/lms/courseware.py   |   4 +-
 .../transformers/hidden_content.py            |  14 +-
 lms/djangoapps/courseware/tests/test_views.py |   2 +-
 lms/templates/hidden_content.html             |  49 +++----
 10 files changed, 112 insertions(+), 151 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index f1789eeff8..df448141fd 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -981,7 +981,6 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
         "release_date": release_date,
         "visibility_state": visibility_state,
         "has_explicit_staff_lock": xblock.fields['visible_to_staff_only'].is_set_on(xblock),
-        "self_paced": is_self_paced(course),
         "start": xblock.fields['start'].to_json(xblock.start),
         "graded": xblock.graded,
         "due_date": get_default_time_display(xblock.due),
diff --git a/cms/static/js/views/modals/course_outline_modals.js b/cms/static/js/views/modals/course_outline_modals.js
index 8bfe529220..281c4243d3 100644
--- a/cms/static/js/views/modals/course_outline_modals.js
+++ b/cms/static/js/views/modals/course_outline_modals.js
@@ -712,10 +712,7 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
             return $.extend(
                 {},
                 AbstractVisibilityEditor.prototype.getContext.call(this),
-                {
-                    hide_after_due: this.modelVisibility() === 'hide_after_due',
-                    self_paced: this.model.get('self_paced') === true
-                }
+                {hide_after_due: this.modelVisibility() === 'hide_after_due'}
             );
         }
     });
diff --git a/cms/templates/js/content-visibility-editor.underscore b/cms/templates/js/content-visibility-editor.underscore
index e66ae634c8..e80830ecd0 100644
--- a/cms/templates/js/content-visibility-editor.underscore
+++ b/cms/templates/js/content-visibility-editor.underscore
@@ -12,19 +12,9 @@
         <li class="field-radio">
             <label class="label">
                 <input class="input input-radio" name="content-visibility" type="radio" value="hide_after_due" aria-described-by="hide_after_due_description">
-                <% if (self_paced) { %>
-                    <%- gettext('Hide content after course end date') %>
-                <% } else { %>
-                    <%- gettext('Hide content after due date') %>
-                <% } %>
+                <%- gettext('Hide content after due date') %>
             </label>
-            <p class='field-message' id='hide_after_due_description'>
-                <% if (self_paced) { %>
-                    <%- gettext('After the course\'s end date has passed, learners can no longer access subsection content. The subsection remains included in grade calculations.') %>
-                <% } else { %>
-                    <%- gettext('After the subsection\'s due date has passed, learners can no longer access its content. The subsection remains included in grade calculations.') %>
-                <% } %>
-            </p>
+            <p class='field-message' id='hide_after_due_description'> <%- gettext('After the subsection\'s due date has passed, learners can no longer access its content. The subsection remains included in grade calculations.') %> </p>
         </li>
         <li class="field-radio">
             <label class="label">
@@ -39,7 +29,7 @@
     <% if (hasExplicitStaffLock && !ancestorLocked) { %>
         <p class="tip tip-warning">
             <%- interpolate(
-                gettext('If you select an option other than "%(hide_label)s", published units in this subsection become available to learners unless they are explicitly hidden.'),
+                gettext('If you select an option other than "%(hide_label)s", after the subsection release date has passed, published units in this subsection will become available to learners unless units are explicitly hidden.'),
                 { hide_label: hide_label },
                 true
             ) %>
diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore
index 4e1418a658..383176314c 100644
--- a/cms/templates/js/course-outline.underscore
+++ b/cms/templates/js/course-outline.underscore
@@ -201,12 +201,7 @@ if (is_proctored_exam) {
                 <p>
                     <% if (xblockInfo.get('hide_after_due')) { %>
                         <span class="icon fa fa-eye-slash" aria-hidden="true"></span>
-                        <span class="status-hide-after-due-value">
-                        <% if (course.get('self_paced')) { %>
-                            <%- gettext("Subsection is hidden after course end date") %> </span>
-                        <% } else { %>
-                            <%- gettext("Subsection is hidden after due date") %> </span>
-                        <% } %>
+                        <span class="status-hide-after-due-value"> <%- gettext("Subsection is hidden after due date") %> </span>
                     <% } %>
                 </p>
             </div>
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index 8233f2a669..ca588eee33 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -202,16 +202,16 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
         raise NotFoundError('Unexpected dispatch type')
 
     @classmethod
-    def verify_current_content_visibility(cls, date, hide_after_date):
+    def verify_current_content_visibility(cls, due, hide_after_due):
         """
         Returns whether the content visibility policy passes
-        for the given date and hide_after_date values and
+        for the given due date and hide_after_due values and
         the current date-time.
         """
         return (
-            not date or
-            not hide_after_date or
-            datetime.now(UTC()) < date
+            not due or
+            not hide_after_due or
+            datetime.now(UTC()) < due
         )
 
     def student_view(self, context):
@@ -246,17 +246,20 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
         runtime user. If so, returns a banner_text or the fragment to
         display depending on whether staff is masquerading.
         """
-        course = self._get_course()
-        if not self._can_user_view_content(course):
-            if course.self_paced:
-                banner_text = _("Because the course has ended, this assignment is hidden from the learner.")
-            else:
-                banner_text = _("Because the due date has passed, this assignment is hidden from the learner.")
+        if not self._can_user_view_content():
+            subsection_format = (self.format or _("subsection")).lower()  # pylint: disable=no-member
+
+            # Translators: subsection_format refers to the assignment
+            # type of the subsection, such as Homework, Lab, Exam, etc.
+            banner_text = _(
+                "Because the due date has passed, "
+                "this {subsection_format} is hidden from the learner."
+            ).format(subsection_format=subsection_format)
 
             hidden_content_html = self.system.render_template(
                 'hidden_content.html',
                 {
-                    'self_paced': course.self_paced,
+                    'subsection_format': subsection_format,
                     'progress_url': context.get('progress_url'),
                 }
             )
@@ -277,15 +280,14 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
             if content_milestones and self.runtime.user_is_staff:
                 return banner_text
 
-    def _can_user_view_content(self, course):
+    def _can_user_view_content(self):
         """
         Returns whether the runtime user can view the content
         of this sequential.
         """
-        hidden_date = course.end if course.self_paced else self.due
         return (
             self.runtime.user_is_staff or
-            self.verify_current_content_visibility(hidden_date, self.hide_after_due)
+            self.verify_current_content_visibility(self.due, self.hide_after_due)
         )
 
     def _student_view(self, context, banner_text=None):
diff --git a/common/lib/xmodule/xmodule/tests/test_sequence.py b/common/lib/xmodule/xmodule/tests/test_sequence.py
index 26112a6110..5643ada5ca 100644
--- a/common/lib/xmodule/xmodule/tests/test_sequence.py
+++ b/common/lib/xmodule/xmodule/tests/test_sequence.py
@@ -3,46 +3,49 @@ Tests for sequence module.
 """
 # pylint: disable=no-member
 from datetime import timedelta
+import ddt
 from django.utils.timezone import now
 from freezegun import freeze_time
-from mock import Mock, patch
-from xmodule.seq_module import SequenceModule
+from mock import Mock
 from xmodule.tests import get_test_system
 from xmodule.tests.helpers import StubUserService
-from xmodule.tests.xml import factories as xml, XModuleXmlImportTest
+from xmodule.tests.xml import XModuleXmlImportTest
+from xmodule.tests.xml import factories as xml
 from xmodule.x_module import STUDENT_VIEW
-
-TODAY = now()
-DUE_DATE = TODAY + timedelta(days=7)
-PAST_DUE_BEFORE_END_DATE = TODAY + timedelta(days=14)
-COURSE_END_DATE = TODAY + timedelta(days=21)
+from xmodule.seq_module import SequenceModule
 
 
+@ddt.ddt
 class SequenceBlockTestCase(XModuleXmlImportTest):
     """
-    Base class for tests of Sequence Module.
+    Tests for the Sequence Module.
     """
-    def setUp(self):
-        super(SequenceBlockTestCase, self).setUp()
+    TODAY = now()
+    TOMORROW = TODAY + timedelta(days=1)
+    DAY_AFTER_TOMORROW = TOMORROW + timedelta(days=1)
 
-        course_xml = self._set_up_course_xml()
-        self.course = self.process_xml(course_xml)
-        self._set_up_module_system(self.course)
+    @classmethod
+    def setUpClass(cls):
+        super(SequenceBlockTestCase, cls).setUpClass()
 
-        for chapter_index in range(len(self.course.get_children())):
-            chapter = self._set_up_block(self.course, chapter_index)
-            setattr(self, 'chapter_{}'.format(chapter_index + 1), chapter)
+        course_xml = cls._set_up_course_xml()
+        cls.course = cls.process_xml(course_xml)
+        cls._set_up_module_system(cls.course)
+
+        for chapter_index in range(len(cls.course.get_children())):
+            chapter = cls._set_up_block(cls.course, chapter_index)
+            setattr(cls, 'chapter_{}'.format(chapter_index + 1), chapter)
 
             for sequence_index in range(len(chapter.get_children())):
-                sequence = self._set_up_block(chapter, sequence_index)
-                setattr(self, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
+                sequence = cls._set_up_block(chapter, sequence_index)
+                setattr(cls, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
 
-    @staticmethod
-    def _set_up_course_xml():
+    @classmethod
+    def _set_up_course_xml(cls):
         """
         Sets up and returns XML course structure.
         """
-        course = xml.CourseFactory.build(end=str(COURSE_END_DATE))
+        course = xml.CourseFactory.build()
 
         chapter_1 = xml.ChapterFactory.build(parent=course)  # has 2 child sequences
         xml.ChapterFactory.build(parent=course)  # has 0 child sequences
@@ -55,7 +58,7 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         xml.SequenceFactory.build(  # sequence_4_1
             parent=chapter_4,
             hide_after_due=str(True),
-            due=str(DUE_DATE),
+            due=str(cls.TOMORROW),
         )
 
         for _ in range(3):
@@ -63,13 +66,14 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
 
         return course
 
-    def _set_up_block(self, parent, index_in_parent):
+    @classmethod
+    def _set_up_block(cls, parent, index_in_parent):
         """
         Sets up the stub sequence module for testing.
         """
         block = parent.get_children()[index_in_parent]
 
-        self._set_up_module_system(block)
+        cls._set_up_module_system(block)
 
         block.xmodule_runtime._services['bookmarks'] = Mock()  # pylint: disable=protected-access
         block.xmodule_runtime._services['user'] = StubUserService()  # pylint: disable=protected-access
@@ -77,7 +81,8 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         block.parent = parent.location
         return block
 
-    def _set_up_module_system(self, block):
+    @classmethod
+    def _set_up_module_system(cls, block):
         """
         Sets up the test module system for the given block.
         """
@@ -85,28 +90,6 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         module_system.descriptor_runtime = block._runtime  # pylint: disable=protected-access
         block.xmodule_runtime = module_system
 
-    def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None, self_paced=False):
-        """
-        Returns the rendered student view for the given sequence and the
-        requested_child parameter.
-        """
-        context = {'requested_child': requested_child}
-        if extra_context:
-            context.update(extra_context)
-
-        # The render operation will ask modulestore for the current course to get some data. As these tests were
-        # originally not written to be compatible with a real modulestore, we've mocked out the relevant return values.
-        with patch.object(SequenceModule, '_get_course') as mock_course:
-            self.course.self_paced = self_paced
-            mock_course.return_value = self.course
-            return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
-
-    def _assert_view_at_position(self, rendered_html, expected_position):
-        """
-        Verifies that the rendered view contains the expected position.
-        """
-        self.assertIn("'position': {}".format(expected_position), rendered_html)
-
     def test_student_view_init(self):
         seq_module = SequenceModule(runtime=Mock(position=2), descriptor=Mock(), scope_ids=Mock())
         self.assertEquals(seq_module.position, 2)  # matches position set in the runtime
@@ -129,6 +112,22 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         html = self._get_rendered_student_view(self.sequence_3_1, requested_child='last')
         self._assert_view_at_position(html, expected_position=3)
 
+    def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None):
+        """
+        Returns the rendered student view for the given sequence and the
+        requested_child parameter.
+        """
+        context = {'requested_child': requested_child}
+        if extra_context:
+            context.update(extra_context)
+        return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
+
+    def _assert_view_at_position(self, rendered_html, expected_position):
+        """
+        Verifies that the rendered view contains the expected position.
+        """
+        self.assertIn("'position': {}".format(expected_position), rendered_html)
+
     def test_tooltip(self):
         html = self._get_rendered_student_view(self.sequence_3_1, requested_child=None)
         for child in self.sequence_3_1.children:
@@ -139,18 +138,26 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         self.assertIn("seq_module.html", html)
         self.assertIn("'banner_text': None", html)
 
-    @freeze_time(COURSE_END_DATE)
-    def test_hidden_content_past_due(self):
+    @freeze_time(DAY_AFTER_TOMORROW)
+    @ddt.data(
+        (None, 'subsection'),
+        ('Homework', 'homework'),
+    )
+    @ddt.unpack
+    def test_hidden_content_past_due(self, format_type, expected_text):
         progress_url = 'http://test_progress_link'
+        self._set_sequence_format(self.sequence_4_1, format_type)
         html = self._get_rendered_student_view(
             self.sequence_4_1,
             extra_context=dict(progress_url=progress_url),
         )
         self.assertIn("hidden_content.html", html)
         self.assertIn(progress_url, html)
+        self.assertIn("'subsection_format': '{}'".format(expected_text), html)
 
-    @freeze_time(COURSE_END_DATE)
+    @freeze_time(DAY_AFTER_TOMORROW)
     def test_masquerade_hidden_content_past_due(self):
+        self._set_sequence_format(self.sequence_4_1, "Homework")
         html = self._get_rendered_student_view(
             self.sequence_4_1,
             extra_context=dict(specific_masquerade=True),
@@ -158,23 +165,13 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         self.assertIn("seq_module.html", html)
         self.assertIn(
             "'banner_text': 'Because the due date has passed, "
-            "this assignment is hidden from the learner.'",
+            "this homework is hidden from the learner.'",
             html
         )
 
-    @freeze_time(PAST_DUE_BEFORE_END_DATE)
-    def test_hidden_content_self_paced_past_due_before_end(self):
-        html = self._get_rendered_student_view(self.sequence_4_1, self_paced=True)
-        self.assertIn("seq_module.html", html)
-        self.assertIn("'banner_text': None", html)
-
-    @freeze_time(COURSE_END_DATE + timedelta(days=7))
-    def test_hidden_content_self_paced_past_end(self):
-        progress_url = 'http://test_progress_link'
-        html = self._get_rendered_student_view(
-            self.sequence_4_1,
-            extra_context=dict(progress_url=progress_url),
-            self_paced=True,
-        )
-        self.assertIn("hidden_content.html", html)
-        self.assertIn(progress_url, html)
+    def _set_sequence_format(self, sequence, format_type):
+        """
+        Sets the format field on the given sequence to the
+        given value.
+        """
+        sequence._xmodule.format = format_type  # pylint: disable=protected-access
diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py
index ef5381a49b..d3826372ca 100644
--- a/common/test/acceptance/pages/lms/courseware.py
+++ b/common/test/acceptance/pages/lms/courseware.py
@@ -209,13 +209,13 @@ class CoursewarePage(CoursePage):
         """
         return self.q(css="div.proctored-exam.completed").visible
 
-    def content_hidden_past_due_date(self):
+    def content_hidden_past_due_date(self, content_type="subsection"):
         """
         Returns whether the "the due date for this ___ has passed" message is present.
         ___ is the type of the hidden content, and defaults to subsection.
         This being true implies "the ___ contents are hidden because their due date has passed".
         """
-        message = "this assignment is no longer available"
+        message = "The due date for this {0} has passed.".format(content_type)
         if self.q(css="div.seq_content").is_present():
             return False
         for html in self.q(css="div.hidden-content").html:
diff --git a/lms/djangoapps/course_blocks/transformers/hidden_content.py b/lms/djangoapps/course_blocks/transformers/hidden_content.py
index 3f2e2275c2..4e1597513e 100644
--- a/lms/djangoapps/course_blocks/transformers/hidden_content.py
+++ b/lms/djangoapps/course_blocks/transformers/hidden_content.py
@@ -25,7 +25,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
 
     Staff users are exempted from hidden content rules.
     """
-    VERSION = 2
+    VERSION = 1
     MERGED_DUE_DATE = 'merged_due_date'
     MERGED_HIDE_AFTER_DUE = 'merged_hide_after_due'
 
@@ -41,7 +41,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
     def _get_merged_hide_after_due(cls, block_structure, block_key):
         """
         Returns whether the block with the given block_key in the
-        given block_structure should be hidden after due date per
+        given block_structure should be visible to staff only per
         computed value from ancestry chain.
         """
         return block_structure.get_transformer_block_field(
@@ -81,8 +81,6 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
             func_merge_ancestors=min,
         )
 
-        block_structure.request_xblock_fields(u'self_paced', u'end')
-
     def transform_block_filters(self, usage_info, block_structure):
         # Users with staff access bypass the Visibility check.
         if usage_info.has_staff_access:
@@ -99,10 +97,6 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
         Returns whether the block with the given block_key should
         be hidden, given the current time.
         """
+        due = self._get_merged_due_date(block_structure, block_key)
         hide_after_due = self._get_merged_hide_after_due(block_structure, block_key)
-        self_paced = block_structure[block_structure.root_block_usage_key].self_paced
-        if self_paced:
-            hidden_date = block_structure[block_structure.root_block_usage_key].end
-        else:
-            hidden_date = self._get_merged_due_date(block_structure, block_key)
-        return not SequenceModule.verify_current_content_visibility(hidden_date, hide_after_due)
+        return not SequenceModule.verify_current_content_visibility(due, hide_after_due)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 1bc2a72fdc..43d3f7e400 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -199,7 +199,7 @@ class IndexQueryTestCase(ModuleStoreTestCase):
     NUM_PROBLEMS = 20
 
     @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 9),
+        (ModuleStoreEnum.Type.mongo, 8),
         (ModuleStoreEnum.Type.split, 4),
     )
     @ddt.unpack
diff --git a/lms/templates/hidden_content.html b/lms/templates/hidden_content.html
index 33d7b79a7e..7e6f4b5c04 100644
--- a/lms/templates/hidden_content.html
+++ b/lms/templates/hidden_content.html
@@ -5,35 +5,22 @@ from openedx.core.djangolib.markup import HTML, Text
 %>
 
 <div class="sequence hidden-content proctored-exam completed">
-    <h3>
-        % if self_paced:
-            ${_("The course has ended.")}
-        % else:
-            ${_("The due date for this assignment has passed.")}
-        % endif
-    </h3>
-    <hr>
-    <p>
-        % if self_paced:
-            ${Text(_(
-                "Because the course has ended, this assignment is no longer "
-                "available.{line_break}If you have completed this assignment, your "
-                "grade is available on the {link_start}progress page{link_end}."
-            )).format(
-                line_break=HTML("<br>"),
-                link_start=HTML("<a href='{}'>").format(progress_url),
-                link_end=HTML("</a>"),
-            )}
-        % else:
-            ${Text(_(
-                "Because the due date has passed, this assignment is no longer "
-                "available.{line_break}If you have completed this assignment, your "
-                "grade is available on the {link_start}progress page{link_end}."
-            )).format(
-                line_break=HTML("<br>"),
-                link_start=HTML("<a href='{}'>").format(progress_url),
-                link_end=HTML("</a>"),
-            )}
-        % endif
-    </p>
+  <h3>
+      ${_("The due date for this {subsection_format} has passed.").format(
+        subsection_format=subsection_format,
+      )}
+  </h3>
+  <hr>
+  <p>
+      ${Text(_(
+          "Because the due date has passed, this {subsection_format} "
+          "is no longer available.{line_break}If you have completed this {subsection_format}, "
+          "your grade is available on the {link_start}progress page{link_end}."
+        )).format(
+          subsection_format=subsection_format,
+          line_break=HTML("<br>"),
+          link_start=HTML("<a href='{}'>").format(progress_url),
+          link_end=HTML("</a>"),
+      )}
+  </p>
 </div>

From 89a13cb7cc4a80924aaaac51bac74964640617a8 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Thu, 12 Jan 2017 15:32:23 -0500
Subject: [PATCH 10/10] Use a codejail change that allows threads

---
 requirements/edx/github.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 9789011ba4..17ffa685a9 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -72,7 +72,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002
 
 # Our libraries:
 git+https://github.com/edx/XBlock.git@xblock-0.4.13#egg=XBlock==0.4.13
--e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail
+-e git+https://github.com/edx/codejail.git@0b2dc694f05ddc8fee3e65d837cee57b6ce51a6b#egg=codejail==0.0
 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1
 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock