From 4cdc24be0d815511c7fc96226388cff94ad347a2 Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Tue, 11 Dec 2018 09:19:16 +0200 Subject: [PATCH 1/2] make list not set --- corehq/apps/hqmedia/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/corehq/apps/hqmedia/models.py b/corehq/apps/hqmedia/models.py index 4d94ae34131c..30f8842614b6 100644 --- 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, From bf4d622d8deb9f6c01ff219486d324da5965dcbc Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Tue, 11 Dec 2018 09:19:24 +0200 Subject: [PATCH 2/2] don't log if no deletion --- corehq/apps/hqmedia/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/corehq/apps/hqmedia/models.py b/corehq/apps/hqmedia/models.py index 30f8842614b6..0a63847d1644 100644 --- a/corehq/apps/hqmedia/models.py +++ b/corehq/apps/hqmedia/models.py @@ -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: