Skip to content

Commit eb1ede7

Browse files
committed
Merge tag '2.1.2'
Hotfix release 2.1.2 Fix SQL error when creating the filter rule
2 parents 1875e4a + 7ccdcdc commit eb1ede7

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/filter_range.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2021 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -15,7 +15,8 @@
1515
* @author Stefan Heimes <stefan_heimes@hotmail.com>
1616
* @author David Molineus <david.molineus@netzmacht.de>
1717
* @author Richard Henkenjohann <richardhenkenjohann@googlemail.com>
18-
* @copyright 2012-2019 The MetaModels team.
18+
* @author Ingolf Steinhardt <info@e-spin.de>
19+
* @copyright 2012-2021 The MetaModels team.
1920
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
2021
* @filesource
2122
*/
@@ -68,13 +69,7 @@ protected function isAllowedContext($dataDefinition, $propertyName, $model)
6869
}
6970

7071
// Check the name of the property.
71-
if ('attr_id2' !== $propertyName) {
72-
return false;
73-
}
74-
75-
// Check the type.
76-
$property = $model->getProperty('type');
77-
return !('range' !== $property && 'rangedate' !== $property);
72+
return ('attr_id2' === $propertyName);
7873
}
7974

8075
/**

0 commit comments

Comments
 (0)