diff --git a/lms/djangoapps/verified_track_content/models.py b/lms/djangoapps/verified_track_content/models.py index 5bf3b2271d..4b5b4f6134 100644 --- a/lms/djangoapps/verified_track_content/models.py +++ b/lms/djangoapps/verified_track_content/models.py @@ -49,6 +49,8 @@ def move_to_verified_cohort(sender, instance, **kwargs): # pylint: disable=unus 'verified_cohort_name': verified_cohort_name, 'default_cohort_name': random_cohort.name } + log.info("Queuing automatic cohorting for user '%s' in course '%s'", instance.user.username, course_key) + # Do the update with a 3-second delay in hopes that the CourseEnrollment transaction has been # completed before the celery task runs. We want a reasonably short delay in case the learner # immediately goes to the courseware. diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index 4f6dc926ce..3b501971d6 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -363,7 +363,7 @@ &:hover, &:focus { - color: $link-color; + color: $forum-color-active-text; background-color: $forum-color-active-thread; } } diff --git a/openedx/core/djangoapps/course_groups/models.py b/openedx/core/djangoapps/course_groups/models.py index bb0103d026..14ce7a7fe8 100644 --- a/openedx/core/djangoapps/course_groups/models.py +++ b/openedx/core/djangoapps/course_groups/models.py @@ -90,6 +90,8 @@ class CohortMembership(models.Model): def save(self, *args, **kwargs): self.full_clean(validate_unique=False) + log.info("Saving CohortMembership for '%s' (id=%s) in '%s'", self.user.username, self.user.id, self.course_id) + # Avoid infinite recursion if creating from get_or_create() call below. # This block also allows middleware to use CohortMembership.get_or_create without worrying about outer_atomic if 'force_insert' in kwargs and kwargs['force_insert'] is True: diff --git a/package.json b/package.json index 397e01ea2a..42f7fe486f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "backbone": "~1.3.2", "backbone-validation": "~0.11.5", "coffee-script": "1.6.1", - "edx-pattern-library": "0.16.5", + "edx-pattern-library": "0.16.6", "edx-ui-toolkit": "1.4.1", "jquery": "~2.2.0", "jquery-migrate": "^1.4.1",