Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements

Fix/cdodge/studio forum improvements

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -14,6 +14,7 @@ from json import loads
 import traceback
 
 from django.contrib.auth.models import User
+from django.dispatch import Signal
 from contentstore.utils import get_modulestore
 
 from .utils import ModuleStoreTestCase, parse_json
@@ -792,6 +793,45 @@ class ContentStoreTest(ModuleStoreTestCase):
         # make sure we found the item (e.g. it didn't error while loading)
         self.assertTrue(did_load_item)
 
+    def test_forum_id_generation(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        module_store = modulestore('direct')
+        new_component_location = Location('i4x', 'edX', 'full', 'discussion', 'new_component')
+        source_template_location = Location('i4x', 'edx', 'templates', 'discussion', 'Discussion_Tag')
+
+        # crate a new module and add it as a child to a vertical
+        module_store.clone_item(source_template_location, new_component_location)
+
+        new_discussion_item = module_store.get_item(new_component_location)
+
+        self.assertNotEquals(new_discussion_item.discussion_id, '$$GUID$$')
+
+    def test_update_modulestore_signal_did_fire(self):
+
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        module_store = modulestore('direct')
+
+        try:
+            module_store.modulestore_update_signal = Signal(providing_args=['modulestore', 'course_id', 'location'])
+
+            self.got_signal = False
+
+            def _signal_hander(modulestore=None, course_id=None, location=None, **kwargs):
+                self.got_signal = True
+
+            module_store.modulestore_update_signal.connect(_signal_hander)
+
+            new_component_location = Location('i4x', 'edX', 'full', 'html', 'new_component')
+            source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
+
+            # crate a new module
+            module_store.clone_item(source_template_location, new_component_location)
+
+        finally:
+            module_store.modulestore_update_signal = None
+
+        self.assertTrue(self.got_signal)
+
     def test_metadata_inheritance(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 

cms/djangoapps/contentstore/utils.py

@@ -11,6 +11,7 @@ DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_ta
 #In order to instantiate an open ended tab automatically, need to have this data
 OPEN_ENDED_PANEL = {"name" : "Open Ended Panel", "type" : "open_ended"}
 
+
 def get_modulestore(location):
     """
     Returns the correct modulestore to use for modifying the specified location

cms/one_time_startup.py

@@ -1,9 +1,10 @@
 from dogapi import dog_http_api, dog_stats_api
 from django.conf import settings
 from xmodule.modulestore.django import modulestore
+from django.dispatch import Signal
 from request_cache.middleware import RequestCache
 
-from django.core.cache import get_cache, InvalidCacheBackendError
+from django.core.cache import get_cache
 
 cache = get_cache('mongo_metadata_inheritance')
 for store_name in settings.MODULESTORE:
@@ -11,6 +12,8 @@ for store_name in settings.MODULESTORE:
     store.metadata_inheritance_cache_subsystem = cache
     store.request_cache = RequestCache.get_request_cache()
 
+    modulestore_update_signal = Signal(providing_args=['modulestore', 'course_id', 'location'])
+    store.modulestore_update_signal = modulestore_update_signal
 if hasattr(settings, 'DATADOG_API'):
     dog_http_api.api_key = settings.DATADOG_API
     dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)

cms/templates/widgets/metadata-only-edit.html

@@ -0,0 +1 @@
+<%include file="metadata-edit.html" />