Merge pull request #37 from open-craft/fix-upgrade-error

Fix upgrade error when <message> has no 'type' specified explicitly

Merge pull request #37 from open-craft/fix-upgrade-error
Fix upgrade error when <message> has no 'type' specified explicitly
42901b10 · Braden MacDonald · f9aeb060 · 222b0ae3 · 42901b10 · 42901b10
Commit 42901b10 authored May 22, 2015 by Braden MacDonald
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

problem_builder/message.py
+2 -1

problem_builder/v1/tests/xml/v1_upgrade_a_new.xml
+1 -1

problem_builder/v1/tests/xml/v1_upgrade_a_old.xml
+1 -1

No files found.
--- a/problem_builder/message.py
+++ b/problem_builder/message.py
@@ -159,7 +159,8 @@ class MentoringMessageBlock(XBlock, StudioEditableXBlockMixin):
        """
        block = runtime.construct_xblock_from_class(cls, keys)
        block.content = unicode(node.text or u"")
-        block.type = node.attrib['type']
+        if 'type' in node.attrib:  # 'type' is optional - default is 'completed'
+            block.type = node.attrib['type']
        for child in node:
            block.content += etree.tostring(child, encoding='unicode')


--- a/problem_builder/v1/tests/xml/v1_upgrade_a_new.xml
+++ b/problem_builder/v1/tests/xml/v1_upgrade_a_new.xml
@@ -31,7 +31,7 @@
    <pb-tip values='["elegance","beauty"]'>This is something everyone has to like about this MRQ</pb-tip>
    <pb-tip values='["bugs"]'>Nah, there aren't any!</pb-tip>
  </pb-mrq>
-  <pb-message type="completed">
+  <pb-message>
    <p>Congratulations!</p>
  </pb-message>
  <pb-message type="incomplete">

--- a/problem_builder/v1/tests/xml/v1_upgrade_a_old.xml
+++ b/problem_builder/v1/tests/xml/v1_upgrade_a_old.xml
@@ -56,7 +56,7 @@ Changes from the original:
                    <message type="on-submit">Thank you for answering!</message>
                </mrq>

-                <message type="completed">
+                <message>
                    <html><p>Congratulations!</p></html>
                </message>
                <message type="incomplete">