Merged master

2018-06-05 08:10:23 -05:00
parent a0a05553c9 1ce07ae597
commit 5ed81f5131
2 changed files with 11 additions and 6 deletions
--- a/app/assets/javascripts/app/services/modelManager.js
+++ b/app/assets/javascripts/app/services/modelManager.js
@@ -102,9 +102,9 @@ class ModelManager {
    })
  }

-  itemsForContentType(contentType) {
-    return this.allItems.filter(function(item){
-      return item.content_type == contentType;
+  validItemsForContentType(contentType) {
+    return this.allItems.filter((item) => {
+      return item.content_type == contentType && !item.errorDecrypting;
    });
  }

@@ -185,7 +185,11 @@ class ModelManager {

      this.addItem(item, isDirtyItemPendingDelete);

-      modelsToNotifyObserversOf.push(item);
+      // Observers do not need to handle items that errored while decrypting.
+      if(!item.errorDecrypting) {
+        modelsToNotifyObserversOf.push(item);
+      }
+
      models.push(item);
      processedObjects.push(json_obj);
    }