From e0bc823365da26ee87163af2fc1f9817f7b28cf0 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Thu, 11 Apr 2013 10:42:03 -0400 Subject: [PATCH] remove auto-provisioning because of a dependency problem between cms and lms --- cms/djangoapps/contentstore/views.py | 4 --- common/djangoapps/util/forum_util.py | 27 ------------------- .../commands/seed_permissions_roles.py | 26 ++++++++++++++++-- 3 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 common/djangoapps/util/forum_util.py diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 8e1d2e5bfa..227379979e 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -13,7 +13,6 @@ from xmodule.modulestore.xml_exporter import export_to_xml from tempfile import mkdtemp from django.core.servers.basehttp import FileWrapper from django.core.files.temp import NamedTemporaryFile -from util.forum_util import seed_permissions_roles # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz' from PIL import Image @@ -1515,9 +1514,6 @@ def create_new_course(request): create_all_course_groups(request.user, new_course.location) - # provision the forum - seed_permissions_roles(new_course.location.course_id) - return HttpResponse(json.dumps({'id': new_course.location.url()})) diff --git a/common/djangoapps/util/forum_util.py b/common/djangoapps/util/forum_util.py deleted file mode 100644 index c926a9fe3d..0000000000 --- a/common/djangoapps/util/forum_util.py +++ /dev/null @@ -1,27 +0,0 @@ -from django_comment_client.models import Role - - -def seed_permissions_roles(course_id): - administrator_role = Role.objects.get_or_create(name="Administrator", course_id=course_id)[0] - moderator_role = Role.objects.get_or_create(name="Moderator", course_id=course_id)[0] - community_ta_role = Role.objects.get_or_create(name="Community TA", course_id=course_id)[0] - student_role = Role.objects.get_or_create(name="Student", course_id=course_id)[0] - - for per in ["vote", "update_thread", "follow_thread", "unfollow_thread", - "update_comment", "create_sub_comment", "unvote", "create_thread", - "follow_commentable", "unfollow_commentable", "create_comment", ]: - student_role.add_permission(per) - - for per in ["edit_content", "delete_thread", "openclose_thread", - "endorse_comment", "delete_comment", "see_all_cohorts"]: - moderator_role.add_permission(per) - - for per in ["manage_moderator"]: - administrator_role.add_permission(per) - - moderator_role.inherit_permissions(student_role) - - # For now, Community TA == Moderator, except for the styling. - community_ta_role.inherit_permissions(moderator_role) - - administrator_role.inherit_permissions(moderator_role) diff --git a/lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py b/lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py index cb14bb7bb1..9d6eefd11d 100644 --- a/lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py +++ b/lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py @@ -1,5 +1,5 @@ from django.core.management.base import BaseCommand, CommandError -from util.forum_util import seed_permissions_roles +from django_comment_client.models import Role class Command(BaseCommand): @@ -13,4 +13,26 @@ class Command(BaseCommand): raise CommandError("Too many arguments") course_id = args[0] - seed_permissions_roles(course_id) + administrator_role = Role.objects.get_or_create(name="Administrator", course_id=course_id)[0] + moderator_role = Role.objects.get_or_create(name="Moderator", course_id=course_id)[0] + community_ta_role = Role.objects.get_or_create(name="Community TA", course_id=course_id)[0] + student_role = Role.objects.get_or_create(name="Student", course_id=course_id)[0] + + for per in ["vote", "update_thread", "follow_thread", "unfollow_thread", + "update_comment", "create_sub_comment", "unvote", "create_thread", + "follow_commentable", "unfollow_commentable", "create_comment", ]: + student_role.add_permission(per) + + for per in ["edit_content", "delete_thread", "openclose_thread", + "endorse_comment", "delete_comment", "see_all_cohorts"]: + moderator_role.add_permission(per) + + for per in ["manage_moderator"]: + administrator_role.add_permission(per) + + moderator_role.inherit_permissions(student_role) + + # For now, Community TA == Moderator, except for the styling. + community_ta_role.inherit_permissions(moderator_role) + + administrator_role.inherit_permissions(moderator_role)