Skip to content

Commit 75d7a06

Browse files
stefanheimesstefanheimes
committed
PR #11 from zonky2
Conflicts: contao/dca/tl_metamodel_filtersetting.php
2 parents a5c8269 + dca1464 commit 75d7a06

2 files changed

Lines changed: 60 additions & 78 deletions

File tree

‎contao/config/database.sql‎

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

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* This file is part of MetaModels/filter_checkbox.
4+
* This file is part of MetaModels/filter_range.
55
*
66
* (c) 2012-2018 The MetaModels team.
77
*
@@ -25,7 +25,7 @@
2525
// Range normal.
2626
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+config'][] =
2727
'attr_id2';
28-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+fefilter'][] =
28+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+fefilter'][] =
2929
'urlparam';
3030
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['range extends _attribute_']['+fefilter'][] =
3131
'label';
@@ -43,7 +43,7 @@
4343
// From/To for date.
4444
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+config'][] =
4545
'attr_id2';
46-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+fefilter'][] =
46+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+fefilter'][] =
4747
'urlparam';
4848
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['rangedate extends _attribute_']['+fefilter'][] =
4949
'dateformat';
@@ -65,87 +65,94 @@
6565

6666
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['moreequal'] = array
6767
(
68-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal'],
69-
'exclude' => true,
70-
'default' => true,
71-
'inputType' => 'checkbox',
72-
'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
7374
(
74-
'tl_class' => 'w50'
75+
'tl_class' => 'w50'
7576
)
7677
);
7778

7879
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['lessequal'] = array
7980
(
80-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal'],
81-
'exclude' => true,
82-
'default' => true,
83-
'inputType' => 'checkbox',
84-
'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
8587
(
86-
'tl_class' => 'w50'
88+
'tl_class' => 'w50'
8789
)
8890
);
8991

9092
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['fromfield'] = array
9193
(
92-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
93-
'exclude' => true,
94-
'default' => true,
95-
'inputType' => 'checkbox',
96-
'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
97100
(
98-
'tl_class' => 'w50',
101+
'tl_class' => 'w50',
99102
),
100103
);
101104

102105
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['tofield'] = array
103106
(
104-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
105-
'exclude' => true,
106-
'default' => true,
107-
'inputType' => 'checkbox',
108-
'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
109113
(
110-
'tl_class' => 'w50',
114+
'tl_class' => 'w50',
111115
),
112116
);
113117

114118
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['dateformat'] = array
115119
(
116-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['dateformat'],
117-
'exclude' => true,
118-
'inputType' => 'text',
119-
'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
120125
(
121-
'tl_class' => 'w50'
126+
'tl_class' => 'w50'
122127
)
123128
);
124129

125130
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['timetype'] = array
126131
(
127-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype'],
128-
'exclude' => true,
129-
'inputType' => 'select',
130-
'reference' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions'],
131-
'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
132137
(
133138
'time',
134139
'date',
135140
'datim'
136141
),
137-
'eval' => array
142+
'sql' => 'varchar(64) NOT NULL default \'\'',
143+
'eval' => array
138144
(
139-
'doNotSaveEmpty' => true,
140-
'tl_class' => 'w50'
145+
'doNotSaveEmpty' => true,
146+
'tl_class' => 'w50'
141147
)
142148
);
143149

144150
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['attr_id2'] = array
145151
(
146-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2'],
152+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2'],
147153
'exclude' => true,
148154
'inputType' => 'select',
155+
'sql' => 'int(10) unsigned NOT NULL default \'0\'',
149156
'eval' => array
150157
(
151158
'doNotSaveEmpty' => true,
@@ -160,24 +167,24 @@
160167

161168
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['fromfield'] = array
162169
(
163-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
164-
'exclude' => true,
165-
'default' => true,
166-
'inputType' => 'checkbox',
167-
'eval' => array
170+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield'],
171+
'exclude' => true,
172+
'default' => true,
173+
'inputType' => 'checkbox',
174+
'eval' => array
168175
(
169-
'tl_class' => 'w50 clr'
176+
'tl_class' => 'w50 clr'
170177
)
171178
);
172179

173180
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['tofield'] = array
174181
(
175-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
176-
'exclude' => true,
177-
'default' => true,
178-
'inputType' => 'checkbox',
179-
'eval' => array
182+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield'],
183+
'exclude' => true,
184+
'default' => true,
185+
'inputType' => 'checkbox',
186+
'eval' => array
180187
(
181-
'tl_class' => 'w50'
188+
'tl_class' => 'w50'
182189
)
183190
);

0 commit comments

Comments
 (0)