Merge pull request #664 from FrozenNode/dev

Merge 4.12.1 into master

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

public/js/admin.js

@@ -66,6 +66,12 @@
 			 * object
 			 */
 			listOptions: {},
+
+			/**
+			 * The options for booleans
+			 * array
+			 */
+			boolOptions: [{id: 'true', text: 'true'}, {id: 'false', text: 'false'}]
 		},
 
 		/*

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

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() ?>,

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>
+</div>