summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahesh Gudi2018-11-02 14:50:39 +0530
committerGitHub2018-11-02 14:50:39 +0530
commitd86b6a05b2079df5c967c0eb86936eef7aed7e8b (patch)
tree25b573110d9ecd1bc740c817c4705ed9d145f3ad
parent0a149c1a11d85d15d8c10dcfa6d7b05f62d93651 (diff)
parentaf3225842b4b994ffd00ec7a4b479d7e07ac6012 (diff)
downloadsbhs_server-d86b6a05b2079df5c967c0eb86936eef7aed7e8b.tar.gz
sbhs_server-d86b6a05b2079df5c967c0eb86936eef7aed7e8b.tar.bz2
sbhs_server-d86b6a05b2079df5c967c0eb86936eef7aed7e8b.zip
Merge pull request #5 from CruiseDevice/dev
Modify show all webcam video feature
-rw-r--r--sbhs/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/sbhs/views.py b/sbhs/views.py
index 3b3cd4b..530e692 100644
--- a/sbhs/views.py
+++ b/sbhs/views.py
@@ -747,9 +747,10 @@ def all_images(request):
boards = Board.objects.filter(online=True)
for board in boards:
board_image_link = {}
- Webcam.load_image(board.mid)
+ capture_status = Webcam.load_image(board.mid)
board_image_link["board"] = board
- board_image_link["image_link"] = board.image_link()
+ if capture_status != 0:
+ board_image_link["image_link"] = board.image_link()
image_links.append(board_image_link.copy())
context["image_links"] = image_links
return render(request,'dashboard/all_images.html')