From 9d46ac1ca5a689c54131e9454f3b70cdffb8718e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Fri, 16 Nov 2018 10:21:24 +0000
Subject: [PATCH] Updated returned capture metadata

---
 openflexure_microscope/api/static/main_v1.js | 2 +-
 openflexure_microscope/camera/capture.py     | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/openflexure_microscope/api/static/main_v1.js b/openflexure_microscope/api/static/main_v1.js
index 2ed7ba3c..8eda3ea7 100644
--- a/openflexure_microscope/api/static/main_v1.js
+++ b/openflexure_microscope/api/static/main_v1.js
@@ -69,7 +69,7 @@ function updateCaptures(response) {
         <div class="clearfix">
             <div class="left-col"><img src="${element_uri}/download?thumbnail=true"></div>
             <div class="right-col"> 
-                <b>${element.file}</b><br>
+                <b>${element.filename}</b><br>
                 <a href="${element_uri}/download" target="_blank">View</a> <a href="${element_uri}/download?as_attachment=true">Download</a> Delete <a href="${element_uri}/" target="_blank">JSON</a>
                 <br>
             </div>
diff --git a/openflexure_microscope/camera/capture.py b/openflexure_microscope/camera/capture.py
index 34fb3339..7094967b 100644
--- a/openflexure_microscope/camera/capture.py
+++ b/openflexure_microscope/camera/capture.py
@@ -144,16 +144,10 @@ class StreamObject(object):
             'id': self.id,
             'locked': self.locked,
             'keep_on_disk': self.keep_on_disk,
+            'filename': self.filename,
             'path': self.file,
-            'context_manager': self.context_manager,
         }
 
-        # Get file path
-        if self.file_exists:
-            d['file'] = self.filename
-        else:
-            d['file'] = None
-
         # Check stream
         if self.stream_exists:
             d['stream'] = True