Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Discussions consolidation"

Browse Source
This commit is contained in:
Nimisha Asthagiri
2019-05-02 14:59:56 -04:00
committed by GitHub
parent d9c7db3c44
commit ef0e06cc0a
160 changed files with 436 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/management/commands/import.py
View File

@@ -2,7 +2,7 @@
Script for importing courseware from XML format
"""
from django.core.management.base import BaseCommand
from openedx.core.djangoapps.discussion_common.utils import are_permissions_roles_seeded, seed_permissions_roles
from django_comment_common.utils import are_permissions_roles_seeded, seed_permissions_roles
from xmodule.contentstore.django import contentstore
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore

2
cms/djangoapps/contentstore/management/commands/tests/test_import.py
View File

@@ -9,7 +9,7 @@ import tempfile
from django.core.management import call_command
from path import Path as path
from openedx.core.djangoapps.discussion_common.utils import are_permissions_roles_seeded
from django_comment_common.utils import are_permissions_roles_seeded
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

2
cms/djangoapps/contentstore/tests/test_contentstore.py
View File

@@ -35,7 +35,7 @@ from contentstore.views.component import ADVANCED_COMPONENT_TYPES
from contentstore.config import waffle
from course_action_state.managers import CourseActionStateItemNotFoundError
from course_action_state.models import CourseRerunState, CourseRerunUIStateManager
from openedx.core.djangoapps.discussion_common.utils import are_permissions_roles_seeded
from django_comment_common.utils import are_permissions_roles_seeded
from openedx.core.lib.tempdir import mkdtemp_clean
from student import auth
from student.models import CourseEnrollment

4
cms/djangoapps/contentstore/utils.py
View File

@@ -15,8 +15,8 @@ from opaque_keys.edx.locator import LibraryLocator
from pytz import UTC
from six import text_type
from openedx.core.djangoapps.discussion_common.models import assign_default_role
from openedx.core.djangoapps.discussion_common.utils import seed_permissions_roles
from django_comment_common.models import assign_default_role
from django_comment_common.utils import seed_permissions_roles
from openedx.core.djangoapps.site_configuration.models import SiteConfiguration
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.content_type_gating.partitions import CONTENT_TYPE_GATING_SCHEME