Merge branch 'master' into feature/tomg/fall-design

common/djangoapps/student/models.py

@@ -51,6 +51,7 @@ from django.dispatch import receiver
 from functools import partial
 
 import comment_client as cc
+from django_comment_client.models import Role, Permission
 
 import logging
 
@@ -174,7 +175,6 @@ class PendingEmailChange(models.Model):
     new_email = models.CharField(blank=True, max_length=255, db_index=True)
     activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True)
 
-
 class CourseEnrollment(models.Model):
     user = models.ForeignKey(User)
     course_id = models.CharField(max_length=255, db_index=True)
@@ -184,6 +184,16 @@ class CourseEnrollment(models.Model):
     class Meta:
         unique_together = (('user', 'course_id'), )
 
+@receiver(post_save, sender=CourseEnrollment)
+def assign_default_role(sender, instance, **kwargs):
+    if instance.user.is_staff:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
+    else:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
+
+    logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
+    instance.user.roles.add(role)
+
 #cache_relation(User.profile)
 
 #### Helper methods for use from python manage.py shell.

common/lib/xmodule/xmodule/js/src/video/display.coffee

@@ -44,7 +44,7 @@ class @Video
   fetchMetadata: (url) ->
     @metadata = {}
     $.each @videos, (speed, url) =>
-      $.get "http://gdata.youtube.com/feeds/api/videos/#{url}?v=2&alt=jsonc", ((data) => @metadata[data.data.id] = data.data) , 'jsonp'
+      $.get "https://gdata.youtube.com/feeds/api/videos/#{url}?v=2&alt=jsonc", ((data) => @metadata[data.data.id] = data.data) , 'jsonp'
 
   getDuration: ->
     @metadata[@youtubeId()].duration