From 3a13cd7b34b35a50feba2dd4d5c55944b687263c Mon Sep 17 00:00:00 2001 From: Will Daly <will@edx.org> Date: Fri, 15 Mar 2013 15:09:39 -0400 Subject: [PATCH] Merged changes in factories.py with version in master --- common/djangoapps/terrain/factories.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/terrain/factories.py b/common/djangoapps/terrain/factories.py index 5fa88e4..5ea34d1 100644 --- 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: -- libgit2 0.26.0