Merge tag '2.1.2'

Hotfix release 2.1.2

- Fix #17 - allow "predef_param" in checkbox filters

Author: stefanheimes

src/FilterSetting/Checkbox.php

@@ -73,26 +73,51 @@ public function prepareRules(IFilter $objFilter, $arrFilterUrl)
 
     /**
      * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     public function getParameterDCA()
     {
         // If defined as static, return nothing as not to be manipulated via editors.
         if (!$this->get('predef_param')) {
-            return array();
+            return [];
         }
 
         $objAttribute = $this->getMetaModel()->getAttributeById($this->get('attr_id'));
 
-        return array(
-            $this->getParamName() => array
-            (
-                'label'     => array(
-                    ($this->get('label') ? $this->get('label') : $objAttribute->getName()),
-                    'GET: '.$this->get('urlparam')
-                ),
+        if ($this->get('ynmode') == 'radio') {
+            return [
+                $this->getParamName() => [
+                    'label'     => [
+                        ($this->get('label') ? $this->get('label') : $objAttribute->getName()),
+                        'GET: '.$this->get('urlparam')
+                    ],
+                    'inputType' => 'radio',
+                    'options' => [
+                        '-1' => '-1',
+                        '1' => '1'
+                    ],
+                    'reference' => [
+                        '-1' => $GLOBALS['TL_LANG']['MSC']['no'],
+                        '1'  => $GLOBALS['TL_LANG']['MSC']['yes']
+                    ],
+                    'eval' => [
+                        'includeBlankOption' => $this->get('blankoption')
+                    ]
+                ]
+            ];
+        }
+
+        return [
+            $this->getParamName() => [
+                'label'     => [
+                ($this->get('label') ? $this->get('label') : $objAttribute->getName()),
+                'GET: '.$this->get('urlparam')
+                ],
                 'inputType' => 'checkbox',
-            )
-        );
+            ]
+        ];
     }
 
     /**

src/Resources/contao/dca/tl_metamodel_filtersetting.php

@@ -24,6 +24,8 @@
 
 $GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
     'urlparam';
+$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
+    'predef_param';
 $GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
     'label';
 $GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =