Skip to content

Commit bd15823

Browse files
committed
Merge tag '2.0.0-alpha11'
Bugfix release.
2 parents e137fa4 + fff4296 commit bd15823

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"php":">=5.3",
3030
"contao/core": ">=3.2,<3.6",
3131
"contao-community-alliance/composer-plugin": "~2.0",
32+
"contao-community-alliance/dc-general": "~2.0",
3233
"metamodels/core":"~2.0"
3334
},
3435
"require-dev": {
@@ -41,12 +42,12 @@
4142
},
4243
"autoload": {
4344
"psr-0": {
44-
"MetaModels": "src"
45+
"MetaModels\\": "src"
4546
}
4647
},
4748
"autoload-dev": {
4849
"psr-0": {
49-
"MetaModels\\Test": "tests"
50+
"MetaModels\\Test\\": "tests"
5051
}
5152
},
5253
"extra":{

src/MetaModels/Attribute/Select/AbstractSelect.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public function getFieldDefinition($arrOverrides = array())
181181
$arrFieldDef['inputType'] = 'DcGeneralTreePicker';
182182
$arrFieldDef['eval']['sourceName'] = $this->getSelectSource();
183183
$arrFieldDef['eval']['fieldType'] = 'radio';
184-
$arrFieldDef['eval']['idProperty'] = $this->getAliasColumn();
184+
$arrFieldDef['eval']['idProperty'] = $this->getIdColumn();
185185
$arrFieldDef['eval']['orderField'] = $this->getSortingColumn();
186186
$arrFieldDef['eval']['minLevel'] = $arrOverrides['select_minLevel'];
187187
$arrFieldDef['eval']['maxLevel'] = $arrOverrides['select_maxLevel'];

src/MetaModels/DcGeneral/Events/Table/Attribute/Select/Subscriber.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ public function getColumnNamesFrom($table)
254254
return
255255
array
256256
(
257-
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_column_type'] => array_diff_key(
257+
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_column_type']['sql'] => array_diff_key(
258258
$this->getColumnNamesFromMetaModel($table),
259259
array_flip(array_keys($attributes))
260260
),
261-
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_column_type'] => $attributes
261+
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_column_type']['attribute'] => $attributes
262262
);
263263
}
264264

0 commit comments

Comments
 (0)