From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Wed, 11 Oct 2017 12:16:55 +0000 (+0200)
Subject: DASH: fix 'float' not iterable error (complements 29fd3c2)
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=25034607b3c4e5c619fde6b489e66ecafba269e2;p=mvd_epics.git

DASH: fix 'float' not iterable error (complements 29fd3c2)
---

diff --git a/python_suite/dashboard/views/pv_details_bootstrap.jinja2 b/python_suite/dashboard/views/pv_details_bootstrap.jinja2
index beb90be..2f29ef3 100644
--- a/python_suite/dashboard/views/pv_details_bootstrap.jinja2
+++ b/python_suite/dashboard/views/pv_details_bootstrap.jinja2
@@ -31,7 +31,7 @@
 		Current Value: <span class="value">
 		{% if 'switch' in PV.classes %}
 			<label class="toggle">
-				<input type="checkbox" disabled readonly {{ 'checked' if 'ON' in PV.value else '' }}>
+				<input type="checkbox" disabled readonly {{ 'checked' if PV.value in (1, 'ON') else '' }}>
 				<span data-unchecked="OFF" data-checked="ON"></span>
 			</label>
 		{% else %}
diff --git a/python_suite/dashboard/views/pv_overview.jinja2 b/python_suite/dashboard/views/pv_overview.jinja2
index 185436c..d43a863 100644
--- a/python_suite/dashboard/views/pv_overview.jinja2
+++ b/python_suite/dashboard/views/pv_overview.jinja2
@@ -36,7 +36,7 @@
 								<span class="value">
 								{% if 'switch' in PV.classes %}
 									<label class="toggle">
-										<input type="checkbox" disabled readonly {{ 'checked' if 'ON' in PV.value else '' }}>
+										<input type="checkbox" disabled readonly {{ 'checked' if PV.value in (1, 'ON') else '' }}>
 										<span data-unchecked="OFF" data-checked="ON"></span>
 									</label>
 								{% else %}
diff --git a/python_suite/dashboard/views/pv_overview_bootstrap.jinja2 b/python_suite/dashboard/views/pv_overview_bootstrap.jinja2
index df052d9..3ab57a6 100644
--- a/python_suite/dashboard/views/pv_overview_bootstrap.jinja2
+++ b/python_suite/dashboard/views/pv_overview_bootstrap.jinja2
@@ -35,7 +35,7 @@
 							<span class="value">
 							{% if 'switch' in PV.classes %}
 								<label class="toggle">
-									<input type="checkbox" disabled readonly {{ 'checked' if 'ON' in PV.char_value else '' }}>
+									<input type="checkbox" disabled readonly {{ 'checked' if PV.value in (1, 'ON') else '' }}>
 									<span data-unchecked="OFF" data-checked="ON"></span>
 								</label>
 							{% else %}