Skip to content

Commit d554224

Browse files
stefanheimesstefanheimes
committed
Merge tag '2.0.2'
Hotfix release 2.0.2 - Hotfix move contents of database.sql to dca files - Hotfix travis.yml and composer.json - Updated translations from transifex. - Add .gitattributes - Remove minimum-stability - Fix author validation - Hotfix update PHP version and license - Hotfix move URL parameter to section frontend filter
2 parents bbcbb08 + 75d7a06 commit d554224

7 files changed

Lines changed: 133 additions & 93 deletions

File tree

‎.gitattributes‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.check-author.yml export-ignore
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.travis.yml export-ignore
5+
build.default.properties export-ignore
6+
build.xml export-ignore
7+
phpunit.xml.dist export-ignore
8+
/tests export-ignore

‎.travis.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
language: php
22

33
php:
4-
- "5.4"
5-
- "5.5"
6-
- "5.6"
7-
- "7.0"
4+
- "7.2"
85
- "7.1"
6+
- "7.0"
7+
- "5.6"
98

109
env:
1110
- CONTAO_VERSION=~3.5.5
1211

1312
sudo: false
1413

14+
before_install:
15+
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16+
1517
install:
1618
- travis_retry composer self-update && composer --version
1719
- travis_retry composer require contao/core $CONTAO_VERSION --no-update
@@ -22,3 +24,7 @@ script: ant -keep-going
2224
# Hack to make things work again - we can not use a shallow repository.
2325
git:
2426
depth: 2147483647
27+
28+
cache:
29+
directories:
30+
- vendor

‎composer.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"type": "contao-module",
1111
"homepage": "http://now.metamodel.me/",
12-
"license": "LGPL-3.0+",
12+
"license": "LGPL-3.0-or-later",
1313
"authors": [
1414
{
1515
"name": "Christian Schiffler",
@@ -31,10 +31,11 @@
3131
"source": "https://github.com/MetaModels/filter_range"
3232
},
3333
"require": {
34-
"php": ">=5.4",
34+
"php": "^5.6 || ^7.0",
3535
"contao/core": "^3.5.5",
3636
"contao-community-alliance/composer-plugin": "~2.0",
37-
"metamodels/core": "~2.0"
37+
"contao-community-alliance/dc-general": "~2.0@beta",
38+
"metamodels/core": "~2.0@alpha"
3839
},
3940
"require-dev": {
4041
"cyberspectrum/contao-toolbox": "~0.6",
@@ -61,7 +62,5 @@
6162
"dev-master": "2.0.x-dev",
6263
"dev-develop": "2.1.x-dev"
6364
}
64-
},
65-
"minimum-stability": "dev",
66-
"prefer-stable": true
65+
}
6766
}

‎contao/config/database.sql‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
<?php
22

33
/**
4-
* The MetaModels extension allows the creation of multiple collections of custom items,
5-
* each with its own unique set of selectable attributes, with attribute extendability.
6-
* The Front-End modules allow you to build powerful listing and filtering of the
7-
* data in each collection.
4+
* This file is part of MetaModels/filter_range.
5+
*
6+
* (c) 2012-2018 The MetaModels team.
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*
11+
* This project is provided in good faith and hope to be usable by anyone.
812
*
913
* @package MetaModels
1014
* @subpackage FilterRange
1115
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1216
* @author Stefan Heimes <stefan_heimes@hotmail.com>
1317
* @author Andreas Isaak <info@andreas-isaak.de>
1418
* @author Christian de la Haye <service@delahaye.de>
15-
* @copyright 2015 The MetaModels team.
16-
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0
19+
* @author Ingolf Steinhardt <info@e-spin.de>
20+
* @copyright 2012-2018 The MetaModels team.
21+
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
1722
* @filesource
1823
*/
1924

2025
// Range normal.
2126
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+config'][] =
2227
'attr_id2';
23-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+config'][] =
28+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+fefilter'][] =
2429
'urlparam';
2530
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+fefilter'][] =
2631
'label';
@@ -38,7 +43,7 @@
3843
// From/To for date.
3944
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+config'][] =
4045
'attr_id2';
41-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+config'][] =
46+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+fefilter'][] =
4247
'urlparam';
4348
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+fefilter'][] =
4449
'dateformat';
@@ -60,87 +65,94 @@
6065

6166
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['moreequal'] = array
6267
(
63-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal'],
64-
'exclude' => true,
65-
'default' => true,
66-
'inputType' => 'checkbox',
67-
'eval' => array
68+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal'],
69+
'exclude' => true,
70+
'default' => true,
71+
'inputType' => 'checkbox',
72+
'sql' => 'char(1) NOT NULL default \'1\'',
73+
'eval' => array
6874
(
69-
'tl_class' => 'w50'
75+
'tl_class' => 'w50'
7076
)
7177
);
7278

7379
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['lessequal'] = array
7480
(
75-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal'],
76-
'exclude' => true,
77-
'default' => true,
78-
'inputType' => 'checkbox',
79-
'eval' => array
81+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal'],
82+
'exclude' => true,
83+
'default' => true,
84+
'inputType' => 'checkbox',
85+
'sql' => 'char(1) NOT NULL default \'1\'',
86+
'eval' => array
8087
(
81-
'tl_class' => 'w50'
88+
'tl_class' => 'w50'
8289
)
8390
);
8491

8592
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['fromfield'] = array
8693
(
87-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
88-
'exclude' => true,
89-
'default' => true,
90-
'inputType' => 'checkbox',
91-
'eval' => array
94+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
95+
'exclude' => true,
96+
'default' => true,
97+
'inputType' => 'checkbox',
98+
'sql' => 'char(1) NOT NULL default \'1\'',
99+
'eval' => array
92100
(
93-
'tl_class' => 'w50',
101+
'tl_class' => 'w50',
94102
),
95103
);
96104

97105
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['tofield'] = array
98106
(
99-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
100-
'exclude' => true,
101-
'default' => true,
102-
'inputType' => 'checkbox',
103-
'eval' => array
107+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
108+
'exclude' => true,
109+
'default' => true,
110+
'inputType' => 'checkbox',
111+
'sql' => 'char(1) NOT NULL default \'1\'',
112+
'eval' => array
104113
(
105-
'tl_class' => 'w50',
114+
'tl_class' => 'w50',
106115
),
107116
);
108117

109118
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['dateformat'] = array
110119
(
111-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['dateformat'],
112-
'exclude' => true,
113-
'inputType' => 'text',
114-
'eval' => array
120+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['dateformat'],
121+
'exclude' => true,
122+
'inputType' => 'text',
123+
'sql' => 'char(32) NOT NULL default \'\'',
124+
'eval' => array
115125
(
116-
'tl_class' => 'w50'
126+
'tl_class' => 'w50'
117127
)
118128
);
119129

120130
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['timetype'] = array
121131
(
122-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype'],
123-
'exclude' => true,
124-
'inputType' => 'select',
125-
'reference' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions'],
126-
'options' => array
132+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype'],
133+
'exclude' => true,
134+
'inputType' => 'select',
135+
'reference' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions'],
136+
'options' => array
127137
(
128138
'time',
129139
'date',
130140
'datim'
131141
),
132-
'eval' => array
142+
'sql' => 'varchar(64) NOT NULL default \'\'',
143+
'eval' => array
133144
(
134-
'doNotSaveEmpty' => true,
135-
'tl_class' => 'w50'
145+
'doNotSaveEmpty' => true,
146+
'tl_class' => 'w50'
136147
)
137148
);
138149

139150
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['attr_id2'] = array
140151
(
141-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2'],
152+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2'],
142153
'exclude' => true,
143154
'inputType' => 'select',
155+
'sql' => 'int(10) unsigned NOT NULL default \'0\'',
144156
'eval' => array
145157
(
146158
'doNotSaveEmpty' => true,
@@ -155,24 +167,24 @@
155167

156168
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['fromfield'] = array
157169
(
158-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
159-
'exclude' => true,
160-
'default' => true,
161-
'inputType' => 'checkbox',
162-
'eval' => array
170+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
171+
'exclude' => true,
172+
'default' => true,
173+
'inputType' => 'checkbox',
174+
'eval' => array
163175
(
164-
'tl_class' => 'w50 clr'
176+
'tl_class' => 'w50 clr'
165177
)
166178
);
167179

168180
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['tofield'] = array
169181
(
170-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
171-
'exclude' => true,
172-
'default' => true,
173-
'inputType' => 'checkbox',
174-
'eval' => array
182+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
183+
'exclude' => true,
184+
'default' => true,
185+
'inputType' => 'checkbox',
186+
'eval' => array
175187
(
176-
'tl_class' => 'w50'
188+
'tl_class' => 'w50'
177189
)
178190
);

‎contao/languages/et/default.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
/**
3+
* Translations are managed using Transifex. To create a new translation
4+
* or to help to maintain an existing one, please register at transifex.com.
5+
*
6+
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
7+
*
8+
* @link https://www.transifex.com/signup/
9+
* @link https://www.transifex.com/projects/p/$$project$$/language/$$lang$$/
10+
*
11+
* last-updated: 2018-03-06T13:23:33+01:00
12+
*/
13+
14+
15+
$GLOBALS['TL_LANG']['MSC']['metamodels']['filter_range_from'] = '%s (alates)';
16+
$GLOBALS['TL_LANG']['MSC']['metamodels']['filter_range_to'] = '%s (kuni)';
17+

‎contao/languages/et/tl_metamodel_filtersetting.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
/**
3+
* Translations are managed using Transifex. To create a new translation
4+
* or to help to maintain an existing one, please register at transifex.com.
5+
*
6+
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
7+
*
8+
* @link https://www.transifex.com/signup/
9+
* @link https://www.transifex.com/projects/p/$$project$$/language/$$lang$$/
10+
*
11+
* last-updated: 2018-03-06T13:23:36+01:00
12+
*/
13+
14+
15+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['0'] = 'Teine omadus';
16+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['0'] = 'Väärtuse 1 väli';
17+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['1'] = 'Standard: välja jäetud.';
18+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['1'] = 'Standard: välja jäetud.';
19+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['0'] = 'Skeem';
20+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['date'] = 'Kuupäev';
21+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['datim'] = 'Kuupäev ja kellaaeg';
22+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['time'] = 'Kellaaeg';
23+

0 commit comments

Comments
 (0)