Merge pull request #86 from Kelketek/master

Provide a path for default xml to load upon creation.

mentoring/light_children.py

@@ -126,7 +126,9 @@ class LightChildrenMixin(XBlockWithChildrenFragmentsMixin):
         Load light children from the `xml_content` attribute
         """
         self.light_children = []
-        if not hasattr(self, 'xml_content') or not self.xml_content:
+        no_content = (not hasattr(self, 'xml_content') or not self.xml_content
+                      or callable(self.xml_content))
+        if no_content:
             return
 
         parser = etree.XMLParser(remove_comments=True)

mentoring/mentoring.py

@@ -47,8 +47,14 @@ from .utils import get_scenarios_from_path, load_resource, render_template
 log = logging.getLogger(__name__)
 
 
+def default_xml_content():
+    return render_template('templates/xml/mentoring_default.xml', {
+            'url_name': 'mentoring-{}'.format(uuid.uuid4())})
+
+
 # Classes ###########################################################
 
+
 class MentoringBlock(XBlockWithLightChildren, StepParentMixin):
     """
     An XBlock providing mentoring capabilities
@@ -71,7 +77,7 @@ class MentoringBlock(XBlockWithLightChildren, StepParentMixin):
     enforce_dependency = Boolean(help="Should the next step be the current block to complete?",
                                  default=False, scope=Scope.content, enforce_type=True)
     display_submit = Boolean(help="Allow to submit current block?", default=True, scope=Scope.content)
-    xml_content = String(help="XML content", default='', scope=Scope.content)
+    xml_content = String(help="XML content", default=default_xml_content, scope=Scope.content)
     weight = Float(help="Defines the maximum total grade of the block.",
                    default=1, scope=Scope.content, enforce_type=True)
     num_attempts = Integer(help="Number of attempts a user has answered for this questions",
@@ -94,6 +100,8 @@ class MentoringBlock(XBlockWithLightChildren, StepParentMixin):
 
     FLOATING_BLOCKS = (TitleBlock, MentoringMessageBlock, SharedHeaderBlock)
 
+    FIELDS_TO_INIT = ('xml_content',)
+
     @property
     def is_assessment(self):
         return self.mode == 'assessment'
@@ -373,7 +381,7 @@ class MentoringBlock(XBlockWithLightChildren, StepParentMixin):
         fragment = Fragment()
         fragment.add_content(render_template('templates/html/mentoring_edit.html', {
             'self': self,
-            'xml_content': self.xml_content or self.default_xml_content,
+            'xml_content': self.xml_content,
         }))
         fragment.add_javascript_url(
             self.runtime.local_resource_url(self, 'public/js/mentoring_edit.js'))
@@ -421,13 +429,6 @@ class MentoringBlock(XBlockWithLightChildren, StepParentMixin):
         return response
 
     @property
-    def default_xml_content(self):
-        return render_template('templates/xml/mentoring_default.xml', {
-            'self': self,
-            'url_name': self.url_name_with_default,
-        })
-
-    @property
     def url_name_with_default(self):
         """
         Ensure the `url_name` is set to a unique, non-empty value.