Skip to content

Commit ed4cb61

Browse files
committed
Merge tag '2.0.5'
Hotfix release 2.0.5 Fixes - Transferred sql settings to the dca settings
2 parents ecb3c14 + 3c9eae6 commit ed4cb61

File tree

4 files changed

+79
-48
lines changed

4 files changed

+79
-48
lines changed

contao/config/database.sql

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

contao/dca/tl_metamodel_attribute.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,34 @@
8686
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['file_customFiletree'],
8787
'inputType' => 'checkbox',
8888
'eval' => array('submitOnChange' => true, 'tl_class' => 'w50'),
89+
'sql' => 'char(1) NOT NULL default \'\''
8990
);
9091

9192
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['file_multiple'] = array(
9293
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['file_multiple'],
9394
'inputType' => 'checkbox',
9495
'eval' => array('submitOnChange' => true, 'tl_class' => 'w50'),
96+
'sql' => 'char(1) NOT NULL default \'\''
9597
);
9698

9799
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['file_uploadFolder'] = array(
98100
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['file_uploadFolder'],
99101
'exclude' => true,
100102
'inputType' => 'fileTree',
101103
'eval' => array('fieldType' => 'radio', 'tl_class' => 'clr'),
104+
'sql' => 'blob NULL'
102105
);
103106

104107
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['file_validFileTypes'] = array(
105108
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['file_validFileTypes'],
106109
'inputType' => 'text',
107110
'eval' => array('maxlength' => 255, 'tl_class' => 'w50'),
111+
'sql' => 'varchar(255) NOT NULL default \'\''
108112
);
109113

110114
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['file_filesOnly'] = array(
111115
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['file_filesOnly'],
112116
'inputType' => 'checkbox',
113117
'eval' => array('tl_class' => 'w50 m12'),
118+
'sql' => 'char(1) NOT NULL default \'\''
114119
);

contao/dca/tl_metamodel_rendersetting.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@
4343
'tl_class' => 'w50',
4444
'chosen' => true,
4545
),
46+
'sql' => 'varchar(32) NOT NULL default \'\''
4647
);
4748

4849
$GLOBALS['TL_DCA']['tl_metamodel_rendersetting']['fields']['file_showLink'] = array(
4950
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_rendersetting']['file_showLink'],
5051
'inputType' => 'checkbox',
5152
'eval' => array('tl_class' => 'w50 m12'),
53+
'sql' => 'char(1) NOT NULL default \'\''
5254
);
5355

5456
$GLOBALS['TL_DCA']['tl_metamodel_rendersetting']['fields']['file_showImage'] = array(
@@ -58,6 +60,7 @@
5860
'submitOnChange' => true,
5961
'tl_class' => 'clr',
6062
),
63+
'sql' => 'char(1) NOT NULL default \'\''
6164
);
6265

6366
$GLOBALS['TL_DCA']['tl_metamodel_rendersetting']['fields']['file_imageSize'] = array(
@@ -73,4 +76,5 @@
7376
'helpwizard' => true,
7477
'tl_class' => 'w50',
7578
),
79+
'sql' => 'varchar(255) NOT NULL default \'\''
7680
);
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?php
2+
3+
/**
4+
* This file is part of MetaModels/attribute_translatedfile.
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+
* The MetaModels extension allows the creation of multiple collections of custom items,
12+
* each with its own unique set of selectable attributes, with attribute extendability.
13+
* The Front-End modules allow you to build powerful listing and filtering of the
14+
* data in each collection.
15+
*
16+
* @package MetaModels
17+
* @subpackage AttributeTranslatedFile
18+
* @author Sven Baumann <baumann.sv@gmail.com>
19+
* @copyright 2012-2018 The MetaModels team.
20+
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
21+
* @filesource
22+
* @filesource
23+
*/
24+
25+
/**
26+
* Table tl_metamodel_translatedlongblob
27+
*/
28+
$GLOBALS['TL_DCA']['tl_metamodel_translatedlongblob'] = array
29+
(
30+
// Config
31+
'config' => array
32+
(
33+
'sql' => array
34+
(
35+
'keys' => array
36+
(
37+
'id' => 'primary',
38+
'att_id,item_id,langcode' => 'index'
39+
)
40+
)
41+
),
42+
// Fields
43+
'fields' => array
44+
(
45+
'id' => array
46+
(
47+
'sql' => 'int(10) unsigned NOT NULL auto_increment'
48+
),
49+
'tstamp' => array
50+
(
51+
'sql' => 'int(10) unsigned NOT NULL default \'0\''
52+
),
53+
'att_id' => array
54+
(
55+
'sql' => 'int(10) unsigned NOT NULL default \'0\''
56+
),
57+
'item_id' => array
58+
(
59+
'sql' => 'int(10) unsigned NOT NULL default \'0\''
60+
),
61+
'langcode' => array
62+
(
63+
'sql' => 'varchar(5) NOT NULL default \'\''
64+
),
65+
'value' => array
66+
(
67+
'sql' => 'longblob NULL'
68+
)
69+
)
70+
);

0 commit comments

Comments
 (0)