Skip to content

Hotfix move contents of database.sql to dca files #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baumannsven merged 1 commit into from
Jul 3, 2018
Merged

Hotfix move contents of database.sql to dca files #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions contao/config/database.sql
View file
Open in desktop

This file was deleted.

22 changes: 12 additions & 10 deletions contao/dca/tl_metamodel_attribute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This file is part of MetaModels/attribute_timestamp.
*
* (c) 2012-2016 The MetaModels team.
* (c) 2012-2018 The MetaModels team.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -16,7 +16,8 @@
* @author Stefan Heimes <stefan_heimes@hotmail.com>
* @author Andreas Isaak <info@andreas-isaak.de>
* @author David Greminger <david.greminger@1up.io>
* @copyright 2012-2016 The MetaModels team.
* @author Ingolf Steinhardt <info@e-spin.de>
* @copyright 2012-2018 The MetaModels team.
* @license https://github.com/MetaModels/attribute_timestamp/blob/master/LICENSE LGPL-3.0
* @filesource
*/
Expand All @@ -29,17 +30,18 @@
);

$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['timetype'] = array(
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['timetype'],
'exclude' => true,
'inputType' => 'select',
'reference' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['timetypeOptions'],
'options' => array(
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['timetype'],
'exclude' => true,
'inputType' => 'select',
'reference' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['timetypeOptions'],
'options' => array(
'time',
'date',
'datim',
),
'eval' => array(
'doNotSaveEmpty' => true,
'tl_class' => 'w50',
'sql' => 'varchar(64) NOT NULL default \'\'',
'eval' => array(
'doNotSaveEmpty' => true,
'tl_class' => 'w50',
),
);
16 changes: 9 additions & 7 deletions contao/dca/tl_metamodel_rendersetting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This file is part of MetaModels/attribute_timestamp.
*
* (c) 2012-2016 The MetaModels team.
* (c) 2012-2018 The MetaModels team.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -15,7 +15,8 @@
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
* @author Stefan Heimes <stefan_heimes@hotmail.com>
* @author David Greminger <david.greminger@1up.io>
* @copyright 2012-2016 The MetaModels team.
* @author Ingolf Steinhardt <info@e-spin.de>
* @copyright 2012-2018 The MetaModels team.
* @license https://github.com/MetaModels/attribute_timestamp/blob/master/LICENSE LGPL-3.0
* @filesource
*/
Expand All @@ -28,10 +29,11 @@
);

$GLOBALS['TL_DCA']['tl_metamodel_rendersetting']['fields']['timeformat'] = array(
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_rendersetting']['timeformat'],
'exclude' => true,
'inputType' => 'text',
'eval' => array(
'tl_class' => 'w50',
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_rendersetting']['timeformat'],
'exclude' => true,
'inputType' => 'text',
'sql' => 'varchar(64) NOT NULL default \'\'',
'eval' => array(
'tl_class' => 'w50',
),
);