Commit acfafa65 by David Ormsbee

Merge pull request #1347 from MITx/fix/cdodge/remove-duplicate-assign-default-role

fix merge problem. assign_default_role() ended up being defined twice as...
parents e074c629 dfbe7dd4
...@@ -62,14 +62,3 @@ class Permission(models.Model): ...@@ -62,14 +62,3 @@ class Permission(models.Model):
def __unicode__(self): def __unicode__(self):
return self.name return self.name
@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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment