Merge pull request #8486 from dimagi/case-183558

don't crash on bad state hashes in reports
dimagi · Oct 5, 2015 · 963569f · 963569f
2 parents 86c30bd + ec86478
commit 963569f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/corehq/apps/reports/standard/deployments.py b/corehq/apps/reports/standard/deployments.py
@@ -5,7 +5,7 @@
 from django.core.urlresolvers import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from casexml.apps.phone.models import SyncLog, properly_wrap_sync_log
+from casexml.apps.phone.models import SyncLog, properly_wrap_sync_log, SyncLogAssertionError
 from corehq.apps.receiverwrapper.util import get_meta_appversion_text, get_build_version, \
     BuildVersionSource
 from couchdbkit import ResourceNotFound
@@ -240,6 +240,13 @@ def _fmt_error_info(sync_log):
                         sync_log.error_hash,
                     )
 
+            def _get_state_hash_display(sync_log):
+                try:
+                    return u'{:.10}...'.format(sync_log.get_state_hash())
+                except SyncLogAssertionError as e:
+                    return _(u'Error computing hash! {}').format(e)
+
+
             num_cases = sync_log.case_count()
             columns = [
                 _fmt_date(sync_log.date),
@@ -251,10 +258,10 @@ def _fmt_error_info(sync_log):
                 columns.append(sync_log.log_format)
                 columns.append(_fmt_id(sync_log.previous_log_id) if sync_log.previous_log_id else '---')
                 columns.append(_fmt_error_info(sync_log))
-                columns.append('{:.10}...'.format(sync_log.get_state_hash()))
+                columns.append(_get_state_hash_display(sync_log))
                 columns.append(_naturaltime_with_hover(sync_log.last_submitted))
                 columns.append(u'{}<br>{:.10}'.format(_naturaltime_with_hover(sync_log.last_cached),
-                                                     sync_log.hash_at_last_cached))
+                                                      sync_log.hash_at_last_cached))
 
             return columns