Merge pull request #22697 from dimagi/sk/set-to-list

fix media deletion logging
dimagi · Dec 11, 2018 · f2ce651 · f2ce651
2 parents 12cbc2f + bf4d622
commit f2ce651
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/corehq/apps/hqmedia/models.py b/corehq/apps/hqmedia/models.py
@@ -527,10 +527,10 @@ def get_form_name(self, lang=None):
 
 def _log_media_deletion(app, deleted_media):
     # https://dimagi-dev.atlassian.net/browse/ICDS-2
-    formatted_media = {
+    formatted_media = [
         {'path': path, 'map_item': map_item.to_json(), 'media': media.as_dict() if media else None}
         for path, map_item, media in deleted_media
-    }
+    ]
     soft_assert(to='{}@{}'.format('skelly', 'dimagi.com'))(
         False, "path deleted from multimedia map", json.dumps({
             'domain': app.domain,
@@ -756,7 +756,7 @@ def remove_unused_mappings(self):
                     map_changed = True
                     del self.multimedia_map[path]
 
-        if not allow_deletion:
+        if not allow_deletion and deleted_media:
             _log_media_deletion(self, deleted_media)
 
         if map_changed:
@@ -813,7 +813,7 @@ def get_media_objects(self, languages=None):
                         del self.multimedia_map[path]
                         found_missing_mm = True
 
-        if not allow_deletion:
+        if not allow_deletion and deleted_media:
             _log_media_deletion(self, deleted_media)
 
         if found_missing_mm: