diff --git a/lms/templates/discussion/_discussion_module.html b/lms/templates/discussion/_discussion_module.html
deleted file mode 100644
index 6a8cb9785a..0000000000
--- a/lms/templates/discussion/_discussion_module.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<%page expression_filter="h"/>
-<%include file="_underscore_templates.html" />
-<%!
-from django.utils.translation import ugettext as _
-%>
-
-
diff --git a/openedx/core/djangoapps/content/course_structures/tests.py b/openedx/core/djangoapps/content/course_structures/tests.py
index b87385a9df..78e673dd5b 100644
--- a/openedx/core/djangoapps/content/course_structures/tests.py
+++ b/openedx/core/djangoapps/content/course_structures/tests.py
@@ -32,12 +32,12 @@ class CourseStructureTaskTests(ModuleStoreTestCase):
super(CourseStructureTaskTests, self).setUp()
self.course = CourseFactory.create(org='TestX', course='TS101', run='T1')
self.section = ItemFactory.create(parent=self.course, category='chapter', display_name='Test Section')
- self.discussion_module_1 = ItemFactory.create(
+ self.discussion_xblock_1 = ItemFactory.create(
parent=self.course,
category='discussion',
discussion_id='test_discussion_id_1'
)
- self.discussion_module_2 = ItemFactory.create(
+ self.discussion_xblock_2 = ItemFactory.create(
parent=self.course,
category='discussion',
discussion_id='test_discussion_id_2'
diff --git a/openedx/core/lib/xblock_builtin/README.rst b/openedx/core/lib/xblock_builtin/README.rst
new file mode 100644
index 0000000000..ce8d58b767
--- /dev/null
+++ b/openedx/core/lib/xblock_builtin/README.rst
@@ -0,0 +1,17 @@
+Open edX: Built-in XBlocks
+--------------------------
+
+This area is meant for exceptional and hopefully temporary cases where an
+XBlock is integral to the functionality of the Open edX platform.
+
+This is not a pattern we wish for normal XBlocks to follow; they should live in
+their own repo.
+
+Discussion XBlock
+=================
+
+This XBlock was converted from an XModule, and will hopefully be pulled out of
+edx-platform into its own repo at some point. From discussions, it's not too
+difficult to move the server-side code , but the client-side code is used by
+the discussion board tab and the team discussion, so for now, must remain in
+edx-platform.
diff --git a/openedx/core/lib/xblock_builtin/__init__.py b/openedx/core/lib/xblock_builtin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/__init__.py b/openedx/core/lib/xblock_builtin/xblock_discussion/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/setup.py b/openedx/core/lib/xblock_builtin/xblock_discussion/setup.py
new file mode 100644
index 0000000000..215d21b6fb
--- /dev/null
+++ b/openedx/core/lib/xblock_builtin/xblock_discussion/setup.py
@@ -0,0 +1,35 @@
+"""
+Setup for discussion-forum XBlock.
+"""
+
+import os
+from setuptools import setup
+
+
+def package_data(pkg, root_list):
+ """
+ Generic function to find package_data for `pkg` under `root`.
+ """
+ data = []
+ for root in root_list:
+ for dirname, _, files in os.walk(os.path.join(pkg, root)):
+ for fname in files:
+ data.append(os.path.relpath(os.path.join(dirname, fname), pkg))
+
+ return {pkg: data}
+
+
+setup(
+ name='xblock-discussion',
+ version='0.1',
+ description='XBlock - Discussion',
+ install_requires=[
+ 'XBlock',
+ ],
+ entry_points={
+ 'xblock.v1': [
+ 'discussion = xblock_discussion:DiscussionXBlock'
+ ]
+ },
+ package_data=package_data("xblock_discussion", ["static"]),
+)
diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
new file mode 100644
index 0000000000..50e1c57840
--- /dev/null
+++ b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+"""
+Discussion XBlock
+"""
+import logging
+
+from xblockutils.resources import ResourceLoader
+from xblockutils.studio_editable import StudioEditableXBlockMixin
+
+from xblock.core import XBlock
+from xblock.fields import Scope, String, UNIQUE_ID
+from xblock.fragment import Fragment
+
+log = logging.getLogger(__name__)
+loader = ResourceLoader(__name__) # pylint: disable=invalid-name
+
+
+def _(text):
+ """
+ A noop underscore function that marks strings for extraction.
+ """
+ return text
+
+
+@XBlock.needs('user')
+@XBlock.needs('i18n')
+class DiscussionXBlock(XBlock, StudioEditableXBlockMixin):
+ """
+ Provides a discussion forum that is inline with other content in the courseware.
+ """
+ discussion_id = String(scope=Scope.settings, default=UNIQUE_ID, force_export=True)
+ display_name = String(
+ display_name=_("Display Name"),
+ help=_("Display name for this component"),
+ default="Discussion",
+ scope=Scope.settings
+ )
+ discussion_category = String(
+ display_name=_("Category"),
+ default=_("Week 1"),
+ help=_(
+ "A category name for the discussion. "
+ "This name appears in the left pane of the discussion forum for the course."
+ ),
+ scope=Scope.settings
+ )
+ discussion_target = String(
+ display_name=_("Subcategory"),
+ default="Topic-Level Student-Visible Label",
+ help=_(
+ "A subcategory name for the discussion. "
+ "This name appears in the left pane of the discussion forum for the course."
+ ),
+ scope=Scope.settings
+ )
+ sort_key = String(scope=Scope.settings)
+
+ editable_fields = ["display_name", "discussion_category", "discussion_target"]
+
+ has_author_view = True # Tells Studio to use author_view
+
+ @property
+ def course_key(self):
+ """
+ :return: int course id
+
+ NB: The goal is to move this XBlock out of edx-platform, and so we use
+ scope_ids.usage_id instead of runtime.course_id so that the code will
+ continue to work with workbench-based testing.
+ """
+ return getattr(self.scope_ids.usage_id, 'course_key', None)
+
+ @property
+ def django_user(self):
+ """
+ Returns django user associated with user currently interacting
+ with the XBlock.
+ """
+ user_service = self.runtime.service(self, 'user')
+ if not user_service:
+ return None
+ return user_service._django_user # pylint: disable=protected-access
+
+ def has_permission(self, permission):
+ """
+ Encapsulates lms specific functionality, as `has_permission` is not
+ importable outside of lms context, namely in tests.
+
+ :param user:
+ :param str permission: Permission
+ :rtype: bool
+ """
+ # normal import causes the xmodule_assets command to fail due to circular import - hence importing locally
+ from django_comment_client.permissions import has_permission # pylint: disable=import-error
+
+ return has_permission(self.django_user, permission, self.course_key)
+
+ def student_view(self, context=None):
+ """
+ Renders student view for LMS.
+ """
+ fragment = Fragment()
+
+ course = self.runtime.modulestore.get_course(self.course_key)
+
+ context = {
+ 'discussion_id': self.discussion_id,
+ 'user': self.django_user,
+ 'course': course,
+ 'course_id': self.course_key,
+ 'can_create_thread': self.has_permission("create_thread"),
+ 'can_create_comment': self.has_permission("create_comment"),
+ 'can_create_subcomment': self.has_permission("create_subcomment"),
+ }
+
+ fragment.add_content(self.runtime.render_template('discussion/_discussion_inline.html', context))
+ fragment.initialize_js('DiscussionInlineBlock')
+
+ return fragment
+
+ def author_view(self, context=None): # pylint: disable=unused-argument
+ """
+ Renders author view for Studio.
+ """
+ fragment = Fragment()
+ fragment.add_content(self.runtime.render_template(
+ 'discussion/_discussion_inline_studio.html',
+ {'discussion_id': self.discussion_id}
+ ))
+ return fragment
+
+ def student_view_data(self):
+ """
+ Returns a JSON representation of the student_view of this XBlock.
+ """
+ return {'topic_id': self.discussion_id}
diff --git a/requirements/edx/local.txt b/requirements/edx/local.txt
index 48bc8294da..4bd03e4049 100644
--- a/requirements/edx/local.txt
+++ b/requirements/edx/local.txt
@@ -8,3 +8,5 @@
-e common/lib/sandbox-packages
-e common/lib/symmath
-e common/lib/xmodule
+
+-e openedx/core/lib/xblock_builtin/xblock_discussion