Merge pull request #4786 from aboudreault/inline-discusssion-cohorting

Add always_cohort_inline_discussions in course settings

common/lib/xmodule/xmodule/course_module.py

@@ -917,6 +917,19 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
         return set(config.get("cohorted_discussions", []))
 
+    @property
+    def always_cohort_inline_discussions(self):
+        """
+        This allow to change the default behavior of inline discussions cohorting. By
+        setting this to False, all inline discussions are non-cohorted unless their
+        ids are specified in cohorted_discussions.
+        """
+        config = self.cohort_config
+        if config is None:
+            return True
+
+        return bool(config.get("always_cohort_inline_discussions", True))
+
     @property
     def is_newish(self):
         """

common/lib/xmodule/xmodule/discussion_module.py

@@ -11,7 +11,11 @@ _ = lambda text: text
 
 
 class DiscussionFields(object):
-    discussion_id = String(scope=Scope.settings, default="$$GUID$$")
+    discussion_id = String(
+        display_name=_("Discussion Id"),
+        help=_("The id is a unique identifier for the discussion. It is non editable."),
+        scope=Scope.settings,
+        default="$$GUID$$")
     display_name = String(
         display_name=_("Display Name"),
         help=_("Display name for this module"),