Merge tag '2.1.1' into master

This is a maintenance release.

This release has:
- Add the missing filter setting type renderer

Author: baumannsven

composer.json

@@ -32,9 +32,9 @@
   },
   "require": {
     "php": "^7.1",
-    "contao-community-alliance/dc-general": "^2.1.0",
+    "contao-community-alliance/dc-general": "^2.1.3",
     "contao/core-bundle": "^4.4.8",
-    "metamodels/core": "^2.1",
+    "metamodels/core": "^2.1.1",
     "symfony/dependency-injection": "^3.3 || ^4.0",
     "symfony/http-kernel": "^3.3 || ^4.0"
   },

src/EventListener/DcGeneral/Table/FilterSetting/RangeFilterSettingTypeRendererListener.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of MetaModels/filter_range.
+ *
+ * (c) 2012-2019 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * @package    MetaModels/filter_range
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
+ * @filesource
+ */
+
+namespace MetaModels\FilterRangeBundle\EventListener\DcGeneral\Table\FilterSetting;
+
+use ContaoCommunityAlliance\DcGeneral\Data\ModelInterface;
+use ContaoCommunityAlliance\DcGeneral\EnvironmentInterface;
+use MetaModels\CoreBundle\EventListener\DcGeneral\Table\FilterSetting\AbstractFilterSettingTypeRenderer;
+
+/**
+ * Handles rendering of model from tl_metamodel_filtersetting.
+ */
+class RangeFilterSettingTypeRendererListener extends AbstractFilterSettingTypeRenderer
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTypes()
+    {
+        return ['range', 'rangedate'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getLabelParameters(EnvironmentInterface $environment, ModelInterface $model)
+    {
+        return $this->getLabelParametersWithAttributeAndUrlParam($environment, $model);
+    }
+}

src/Resources/config/services.yml

@@ -35,3 +35,13 @@ services:
           - '@metamodels.filter_setting_factory'
         tags:
           - { name: kernel.event_listener, event: dc-general.view.contao2backend.get-property-options, method: handle}
+
+    metamodels.filter_range.listener.filter_setting_renderer:
+        class: MetaModels\FilterRangeBundle\EventListener\DcGeneral\Table\FilterSetting\RangeFilterSettingTypeRendererListener
+        arguments:
+          - "@metamodels.filter_setting_factory"
+          - "@event_dispatcher"
+          - "@metamodels.assets.icon_builder"
+          - "@cca.dc-general.scope-matcher"
+        tags:
+          -  { name: kernel.event_listener, event: 'dc-general.view.contao2backend.model-to-label', method: modelToLabel}