Merged changes in factories.py with version in master

2013-03-15 15:09:39 -04:00
parent e41bb8462c
commit 3a13cd7b34
1 changed files with 3 additions and 3 deletions
--- a/common/djangoapps/terrain/factories.py
+++ b/common/djangoapps/terrain/factories.py
@@ -164,9 +164,9 @@ class XModuleItemFactory(Factory):
            new_item.display_name = display_name

        # Add additional metadata or override current metadata
-        new_item.metadata.update(metadata)
-
-        store.update_metadata(new_item.location.url(), own_metadata(new_item))
+        item_metadata = own_metadata(new_item)
+        item_metadata.update(metadata)
+        store.update_metadata(new_item.location.url(), item_metadata)

        # replace the data with the optional *data* parameter
        if data is not None: