Skip to content

Commit d154a5a

Browse files
committed
Merge tag '2.0.0-alpha13'
Alpha release The system requirements have been raised in this release. We now require: - PHP >=5.4 - Contao >=3.5.5 (but no Contao 4 support yet, sorry). This fixes: - We now use codeMirror instead of ACE (#992) - An "ORDER BY" was missing in a query (#1020) - Centralized the "add all" for render settings and input screens into a common class. - ToolboxFile is now completely using the Dbafs. This should provide massive speed improvements for file attributes holding a lot of files. - Page picker did not show the selected value (#1026). - Various fixes in code style, comments and the like.
2 parents 2130405 + 7888d3d commit d154a5a

22 files changed

+796
-561
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ I confirm that:
1515
| PHP version: | | |
1616
| Contao version: | | |
1717
| MetaModels version: | | |
18-
| Installation via composer | (yes/no) | |
19-
| Installed MetaModels packages | | |
18+
| Installation via composer: | (yes/no) | |
19+
| Installed MetaModels packages: | | |
20+
| DCG version: | | |
2021

2122
## Issue description
2223

.travis.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
language: php
22

33
php:
4-
- "5.3"
54
- "5.4"
65
- "5.5"
76
- "5.6"
87
- "7.0"
98

109
env:
11-
- CONTAO_VERSION=~3.2.0
12-
- CONTAO_VERSION=~3.3.0
13-
- CONTAO_VERSION=~3.4.0
1410
- CONTAO_VERSION=~3.5.0
15-
16-
# Exclude impossible Contao Version combinations.
17-
matrix:
18-
exclude:
19-
- php: "5.3"
20-
env: CONTAO_VERSION=~3.5.0
21-
11+
2212
sudo: false
2313

2414
install:

composer.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"source": "https://github.com/MetaModels/core"
3131
},
3232
"require": {
33-
"php": ">=5.3",
34-
"contao/core": ">=3.2,<3.6",
33+
"php": ">=5.4",
34+
"contao/core": "^3.5.5",
3535
"contao-community-alliance/composer-plugin": "~2.0",
3636
"contao-community-alliance/dc-general": "~2.0",
3737
"menatwork/contao-multicolumnwizard": "~3.3",
3838
"contao-community-alliance/meta-palettes": "~1.7",
39-
"discordier/justtextwidgets": "~0.5",
39+
"discordier/justtextwidgets": "~1.0",
4040
"contao-community-alliance/url-builder": "~1.1",
4141
"contao-community-alliance/dependency-container": "~1.6",
4242
"contao-community-alliance/event-dispatcher": "~1.3",
@@ -49,9 +49,6 @@
4949
"metamodels/base-unit-tests": "~1.0",
5050
"metamodels/phpunit-contao-database": "~1.0"
5151
},
52-
"conflict": {
53-
"contao/core": "3.4.0"
54-
},
5552
"autoload": {
5653
"psr-0": {
5754
"MetaModels\\": "src"

contao/config/autoload.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
*/
2828
TemplateLoader::addFiles(array
2929
(
30-
'be_autocreatepalette' => 'system/modules/metamodels/templates',
31-
'be_autocreateview' => 'system/modules/metamodels/templates',
30+
'be_addallattributes' => 'system/modules/metamodels/templates',
3231
'be_dcastylepicker' => 'system/modules/metamodels/templates',
3332
'be_detectedproblems' => 'system/modules/metamodels/templates',
3433
'be_metamodel_full' => 'system/modules/metamodels/templates',

contao/config/event_listeners.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
use MetaModels\DcGeneral\Events\MetaModel\DuplicateModel;
2929
use MetaModels\DcGeneral\Events\MetaModel\PasteButton;
3030
use MetaModels\DcGeneral\Events\Table\FilterSetting\FilterSettingTypeRendererCore;
31+
use MetaModels\DcGeneral\Events\Table\InputScreens\InputScreenAddAllHandler;
32+
use MetaModels\DcGeneral\Events\Table\RenderSetting\RenderSettingAddAllHandler;
3133
use MetaModels\Events\CreatePropertyConditionEvent;
3234
use MetaModels\Events\DatabaseBackedListener;
3335
use MetaModels\Events\DefaultPropertyConditionCreator;
@@ -69,6 +71,8 @@ function (MetaModelsBootEvent $event, $eventName, EventDispatcherInterface $disp
6971
new CutButton($event->getServiceContainer());
7072
new CreateVariantButton($event->getServiceContainer());
7173
new DuplicateModel($event->getServiceContainer());
74+
$dispatcher->addSubscriber(new RenderSettingAddAllHandler($event->getServiceContainer()));
75+
$dispatcher->addSubscriber(new InputScreenAddAllHandler($event->getServiceContainer()));
7276
}
7377
),
7478
MetaModelsEvents::ATTRIBUTE_FACTORY_CREATE => array(

contao/dca/tl_metamodel_filtersetting.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/core.
55
*
6-
* (c) 2012-2015 The MetaModels team.
6+
* (c) 2012-2016 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.
@@ -18,7 +18,8 @@
1818
* @author David Greminger <[email protected]>
1919
* @author David Maack <[email protected]>
2020
* @author Stefan Heimes <[email protected]>
21-
* @copyright 2012-2015 The MetaModels team.
21+
* @author Ingolf Steinhardt <[email protected]>
22+
* @copyright 2012-2016 The MetaModels team.
2223
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0
2324
* @filesource
2425
*/
@@ -407,7 +408,7 @@
407408
'allowHtml' => true,
408409
'preserveTags' => true,
409410
'decodeEntities' => true,
410-
'rte' => 'codeMirror|sql',
411+
'rte' => 'ace|sql',
411412
'class' => 'monospace',
412413
'helpwizard' => true,
413414
),

contao/dca/tl_metamodel_rendersettings.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@
315315
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_rendersettings']['jumpTo_page'],
316316
'exclude' => true,
317317
'inputType' => 'text',
318-
// TODO: change callbacks to event handlers.
319318
'wizard' => array
320319
(
321320
array('MetaModels\Dca\RenderSettings', 'pagePicker')
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<div id="tl_buttons">
2+
<a href="<?= $this->href ?>" class="header_back" title="<?= specialchars($this->backBt) ?>"><?= $this->backBt ?></a>
3+
</div>
4+
<div id="tl_metamodel_autocreate_palette">
5+
<h2 class="sub_headline"><?= $this->headline ?></h2>
6+
<form action="<?= $this->action ?>" class="tl_form" method="post">
7+
<div class="tl_formbody_edit">
8+
<input type="hidden" name="REQUEST_TOKEN" value="<?= REQUEST_TOKEN ?>">
9+
<div class="fields">
10+
<div>
11+
<label for="tl_select_trigger">
12+
<input type="checkbox" id="tl_select_trigger"
13+
onclick="Backend.toggleCheckboxes(this)"<?php if (!$this->hasCheckbox): ?> disabled<?php endif; ?> />
14+
<?= $this->selectAll ?>
15+
</label>
16+
</div>
17+
<?php foreach ($this->fields as $field): ?>
18+
<div class="field <?= $field['class'] ?>">
19+
<?php if ($field['checkbox']): ?>
20+
<label for="attribute_<?= $field['attr_id'] ?>">
21+
<input type="checkbox" id="attribute_<?= $field['attr_id'] ?>"
22+
name="attribute_<?= $field['attr_id'] ?>"/>
23+
<?= $field['text'] ?>
24+
</label>
25+
<?php else: ?>
26+
<?= $field['text'] ?>
27+
<?php endif; ?>
28+
</div>
29+
<?php endforeach; ?>
30+
</div>
31+
</div>
32+
<div class="tl_formbody_submit">
33+
<div class="tl_submit_container">
34+
<input type="submit" name="add" class="tl_submit"
35+
value="<?= $this->add ?>"<?php if (!$this->hasCheckbox): ?> disabled<?php endif; ?>>
36+
<input type="submit" name="saveNclose" class="tl_submit" value="<?= $this->saveNclose ?>">
37+
</div>
38+
</div>
39+
</form>
40+
</div>

contao/templates/be_autocreatepalette.html5

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

contao/templates/be_autocreateview.html5

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

0 commit comments

Comments
 (0)