Commit a7719fcc authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch '25-php-error-in-feature-area' into 'master'

Resolve "PHP error in feature area"

Closes #25

See merge request t3o/typo3_roadmap!18
parents 227513b1 33417f57
...@@ -17,6 +17,7 @@ namespace T3o\Typo3Roadmap\Domain\Model; ...@@ -17,6 +17,7 @@ namespace T3o\Typo3Roadmap\Domain\Model;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Annotation as Extbase;
/** /**
* Feature * Feature
...@@ -58,7 +59,6 @@ class Feature extends AbstractEntity ...@@ -58,7 +59,6 @@ class Feature extends AbstractEntity
* typo3releaseminorversion * typo3releaseminorversion
* *
* @var \T3o\Typo3Roadmap\Domain\Model\MinorVersion * @var \T3o\Typo3Roadmap\Domain\Model\MinorVersion
* @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
*/ */
protected $typo3releaseminorversion = null; protected $typo3releaseminorversion = null;
...@@ -66,7 +66,6 @@ class Feature extends AbstractEntity ...@@ -66,7 +66,6 @@ class Feature extends AbstractEntity
* typo3releasemajorversion * typo3releasemajorversion
* *
* @var \T3o\Typo3Roadmap\Domain\Model\MajorVersion * @var \T3o\Typo3Roadmap\Domain\Model\MajorVersion
* @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
*/ */
protected $typo3releasemajorversion = null; protected $typo3releasemajorversion = null;
...@@ -74,7 +73,6 @@ class Feature extends AbstractEntity ...@@ -74,7 +73,6 @@ class Feature extends AbstractEntity
* featureArea * featureArea
* *
* @var \T3o\Typo3Roadmap\Domain\Model\FeatureArea * @var \T3o\Typo3Roadmap\Domain\Model\FeatureArea
* @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
*/ */
protected $featureArea = null; protected $featureArea = null;
......
...@@ -18,6 +18,7 @@ namespace T3o\Typo3Roadmap\Domain\Model; ...@@ -18,6 +18,7 @@ namespace T3o\Typo3Roadmap\Domain\Model;
use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Domain\Model\FileReference;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Annotation as Extbase;
/** /**
* FeatureArea * FeatureArea
......
...@@ -51,14 +51,14 @@ class FeatureRepository extends Repository ...@@ -51,14 +51,14 @@ class FeatureRepository extends Repository
//We need at least min 1 filterConstraint //We need at least min 1 filterConstraint
$constraints[] = $query->greaterThan('uid', 0); $constraints[] = $query->greaterThan('uid', 0);
if ($setting['majorversion'] !== '') { if ($setting['majorversion'] <> '') {
$constraints[] = $query->equals('typo3releasemajorversion', (int)$setting['majorversion']); $constraints[] = $query->equals('typo3releasemajorversion', (int)$setting['majorversion']);
} }
if ($setting['minorversion'] !== '') { if ($setting['minorversion'] <> '') {
$constraints[] = $query->equals('typo3releaseminorversion', (int)$setting['minorversion']); $constraints[] = $query->equals('typo3releaseminorversion', (int)$setting['minorversion']);
} }
if ($setting['featurearea'] !== '') { if ($setting['featurearea'] <> '') {
$constraints[] = $query->equals('featureArea', (int)$setting['featurearea']); $constraints[] = $query->equals('featureArea', (int)$setting['featurearea']);
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<onChange>reload</onChange> <onChange>reload</onChange>
<config> <config>
<type>select</type> <type>select</type>
<renderType>selectSingle</renderType>
<items type="array"> <items type="array">
<numIndex index="0" type="array"> <numIndex index="0" type="array">
<numIndex index="0"></numIndex> <numIndex index="0"></numIndex>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
<displayCond>FIELD:settings.majorversion:REQ:true</displayCond> <displayCond>FIELD:settings.majorversion:REQ:true</displayCond>
<config> <config>
<type>select</type> <type>select</type>
<renderType>selectSingle</renderType>
<itemsProcFunc>T3o\Typo3Roadmap\UserFunc\FlexFormUserFunc->getMinorversions</itemsProcFunc> <itemsProcFunc>T3o\Typo3Roadmap\UserFunc\FlexFormUserFunc->getMinorversions</itemsProcFunc>
</config> </config>
</TCEforms> </TCEforms>
...@@ -46,6 +48,7 @@ ...@@ -46,6 +48,7 @@
<label>Featurearea</label> <label>Featurearea</label>
<config> <config>
<type>select</type> <type>select</type>
<renderType>selectSingle</renderType>
<items type="array"> <items type="array">
<numIndex index="0" type="array"> <numIndex index="0" type="array">
<numIndex index="0"></numIndex> <numIndex index="0"></numIndex>
...@@ -62,4 +65,4 @@ ...@@ -62,4 +65,4 @@
</ROOT> </ROOT>
</sDEF> </sDEF>
</sheets> </sheets>
</T3DataStructure> </T3DataStructure>
\ No newline at end of file
...@@ -29,7 +29,7 @@ $EM_CONF[$_EXTKEY] = array( ...@@ -29,7 +29,7 @@ $EM_CONF[$_EXTKEY] = array(
'clearCacheOnLoad' => 0, 'clearCacheOnLoad' => 0,
'lockType' => '', 'lockType' => '',
'author_company' => 'TYPO3 Association', 'author_company' => 'TYPO3 Association',
'version' => '4.0.0', 'version' => '4.0.1',
'constraints' => array( 'constraints' => array(
'depends' => array( 'depends' => array(
'typo3' => '10.3.0-10.4.99', 'typo3' => '10.3.0-10.4.99',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment