From d8d67c10633340d6deca0ff93773b8dea2560f2c Mon Sep 17 00:00:00 2001
From: Zsombor Franczia <frzsombor@freemail.hu>
Date: Sun, 31 Aug 2014 02:15:55 +0200
Subject: [PATCH 1/3] Fix js issue with non-numeric ids

---
 src/views/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/index.php b/src/views/index.php
index 30b05bbe7..4639a3d83 100644
--- a/src/views/index.php
+++ b/src/views/index.php
@@ -17,7 +17,7 @@
 		adminData = {
 			primary_key: "<?php echo $primaryKey ?>",
 			<?php if ($itemId !== null) {?>
-				id: <?php echo $itemId ?>,
+				id: "<?php echo $itemId ?>",
 			<?php } ?>
 			rows: <?php echo json_encode($rows) ?>,
 			rows_per_page: <?php echo $dataTable->getRowsPerPage() ?>,

From 199942cfc438e8254d0eb146c3775c3e7e3f2239 Mon Sep 17 00:00:00 2001
From: David Mathews <david.mathews@spinen.com>
Date: Mon, 1 Sep 2014 21:17:22 -0400
Subject: [PATCH 2/3] reverting Merge #601 closes #663

---
 public/js/admin.js              | 6 ++++++
 src/views/templates/filters.php | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/js/admin.js b/public/js/admin.js
index d239fdaaf..19c853384 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -66,6 +66,12 @@
 			 * object
 			 */
 			listOptions: {},
+
+			/**
+			 * The options for booleans
+			 * array
+			 */
+			boolOptions: [{id: 'true', text: 'true'}, {id: 'false', text: 'false'}]
 		},
 
 		/*
diff --git a/src/views/templates/filters.php b/src/views/templates/filters.php
index 3fa5437e1..c3213aca8 100644
--- a/src/views/templates/filters.php
+++ b/src/views/templates/filters.php
@@ -30,7 +30,7 @@
 		<!-- /ko -->
 
 		<!-- ko if: type === 'bool' -->
-			<input type="checkbox" value="1" data-bind="checked: value, attr: {id: field_id}" />
+			<input type="hidden" data-bind="value: value, attr: {id: field_id}, select2: {data: {results: $root.boolOptions}}" />
 		<!-- /ko -->
 
 		<!-- ko if: type === 'enum' -->
@@ -82,4 +82,4 @@
 		<!-- /ko -->
 		</div>
 	<!-- /ko -->
-</div>
\ No newline at end of file
+</div>

From 912e570bea8091aff675bad36922581c17b37dc1 Mon Sep 17 00:00:00 2001
From: David Mathews <david.mathews@spinen.com>
Date: Mon, 1 Sep 2014 21:22:37 -0400
Subject: [PATCH 3/3] version bump to 4.12.1

---
 changelog.md | 4 ++++
 readme.md    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/changelog.md b/changelog.md
index ac23730ea..722a610c6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 4.12.1
+- Bugfix: Revert Merge #601 and adds back in select2 for filter booleans due to 3 needed options True, False, Both
+- Bugfix: Fix Js for non numeric ids
+
 ### 4.12.0
 - Added CKEditor to composer to keep updated
 - Added Scrollable Data Table ranther than dropping the columns
diff --git a/readme.md b/readme.md
index 2c958a568..35d7404bc 100644
--- a/readme.md
+++ b/readme.md
@@ -53,6 +53,10 @@ Administrator is released under the MIT License. See the LICENSE file for detail
 
 ## Changelog
 
+### 4.12.1
+- Bugfix: Revert Merge #601 and adds back in select2 for filter booleans due to 3 needed options True, False, Both
+- Bugfix: Fix Js for non numeric ids
+
 ### 4.12.0
 - Added CKEditor to composer to keep updated
 - Added Scrollable Data Table ranther than dropping the columns