Commit a92910db by Chris Dodge

update lms to reflect where comment models.py is now in common

parent ae9d13b5
......@@ -26,7 +26,7 @@ from course_groups.cohorts import get_cohort_id, is_commentable_cohorted
from django_comment_client.utils import JsonResponse, JsonError, extract, get_courseware_context
from django_comment_client.permissions import check_permissions_by_view, cached_has_permission
from django_comment_client.models import Role
from django_comment_common.models import Role
log = logging.getLogger(__name__)
......
from optparse import make_option
from django.core.management.base import BaseCommand, CommandError
from django_comment_client.models import Role
from django_comment_common.models import Role
from django.contrib.auth.models import User
......
......@@ -7,7 +7,7 @@ Enrollments.
from django.core.management.base import BaseCommand, CommandError
from student.models import CourseEnrollment
from django_comment_client.models import assign_default_role
from django_comment_common.models import assign_default_role
class Command(BaseCommand):
......
......@@ -7,7 +7,7 @@ Enrollments.
from django.core.management.base import BaseCommand, CommandError
from student.models import CourseEnrollment
from django_comment_client.models import assign_default_role
from django_comment_common.models import assign_default_role
class Command(BaseCommand):
......
from django.core.management.base import BaseCommand, CommandError
from django_comment_client.models import Role
from django_comment_common.utils import seed_permissions_roles
class Command(BaseCommand):
......@@ -18,21 +18,4 @@ class Command(BaseCommand):
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)
seed_permissions_roles(course_id)
from django.core.management.base import BaseCommand, CommandError
from django_comment_client.models import Permission, Role
from django_comment_common.models import Permission, Role
from django.contrib.auth.models import User
......
from .models import Role, Permission
from django_comment_common.models import Role, Permission
from django.db.models.signals import post_save
from django.dispatch import receiver
from student.models import CourseEnrollment
......
......@@ -6,7 +6,7 @@ from django.test import TestCase
from student.models import CourseEnrollment
from django_comment_client.permissions import has_permission
from django_comment_client.models import Role
from django_comment_common.models import Role
class PermissionsTestCase(TestCase):
......
import django_comment_client.models as models
import django_comment_client.permissions as permissions
import django_comment_common.permissions as permissions
from django.test import TestCase
......
......@@ -2,7 +2,7 @@ from django.test import TestCase
from factory import DjangoModelFactory
from student.tests.factories import UserFactory, CourseEnrollmentFactory
from django_comment_client.models import Role, Permission
from django_comment_common.models import Role, Permission
import django_comment_client.utils as utils
......
......@@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse
from django.db import connection
from django.http import HttpResponse
from django.utils import simplejson
from django_comment_client.models import Role
from django_comment_common.models import Role
from django_comment_client.permissions import check_permissions_by_view
from xmodule.modulestore.exceptions import NoPathToItem
......
......@@ -27,7 +27,7 @@ from courseware.access import (has_access, get_access_group_name,
course_beta_test_group_name)
from courseware.courses import get_course_with_access
from courseware.models import StudentModule
from django_comment_client.models import (Role,
from django_comment_common.models import (Role,
FORUM_ROLE_ADMINISTRATOR,
FORUM_ROLE_MODERATOR,
FORUM_ROLE_COMMUNITY_TA)
......
......@@ -592,5 +592,6 @@ INSTALLED_APPS = (
# Discussion forums
'django_comment_client',
'django_comment_common',
)
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