Skip to content

Commit d4c3ab4

Browse files
committed
minor EAB field related fixes and additions
1 parent 8281533 commit d4c3ab4

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/models/business/ValidationConstraints.xtend

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,9 @@ class ValidationConstraints {
274274
«ELSE»
275275
#[Assert\Expression('«IF !mandatory»!value or «ENDIF»value > this.get«entity.getStartDateField.name.formatForCodeCapital»()', message: 'The start must be before the end.')]
276276
«ENDIF»
277-
«ENDIF»«/*ELSEIF isTimeField» causes issues with EABs TimeField during editing
278-
#[Assert\Time] */»
277+
«ELSEIF isTimeField»
278+
#[Assert\Time]
279+
«ENDIF»
279280
«ENDIF»
280281
'''
281282

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/plugin/GetListEntry.xtend

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ package org.zikula.modulestudio.generator.cartridges.symfony.view.plugin
22

33
import de.guite.modulestudio.metamodel.Application
44
import org.zikula.modulestudio.generator.extensions.FormattingExtensions
5+
import org.zikula.modulestudio.generator.extensions.ModelExtensions
56
import org.zikula.modulestudio.generator.extensions.Utils
67

78
class GetListEntry {
89

910
extension FormattingExtensions = new FormattingExtensions
11+
extension ModelExtensions = new ModelExtensions
1012
extension Utils = new Utils
1113

1214
def generate(Application it) '''
@@ -18,7 +20,7 @@ class GetListEntry {
1820
*/
1921
#[AsTwigFilter('«appName.formatForDB»_listEntry')]
2022
public function getListEntry(
21-
string $value,
23+
«IF getAllListFields.filter[nullable].empty»?«ENDIF»string $value,
2224
string $objectType = '',
2325
string $fieldName = '',
2426
string $delimiter = ', '

0 commit comments

Comments
 (0)