Skip to content

Commit 20de291

Browse files
GuiteGuite
committed
re-enable entity initializer
1 parent 15f8020 commit 20de291

File tree

9 files changed

+18
-102
lines changed

9 files changed

+18
-102
lines changed

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/SymfonyBundleGenerator.xtend‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.eclipse.xtext.generator.IGenerator
88
import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
99
import org.zikula.modulestudio.generator.cartridges.symfony.controller.ControllerLayer
1010
import org.zikula.modulestudio.generator.cartridges.symfony.controller.EventSubscribers
11-
import org.zikula.modulestudio.generator.cartridges.symfony.controller.Events
1211
import org.zikula.modulestudio.generator.cartridges.symfony.controller.FormHandler
1312
import org.zikula.modulestudio.generator.cartridges.symfony.controller.HelperServices
1413
import org.zikula.modulestudio.generator.cartridges.symfony.controller.Workflow
@@ -129,9 +128,6 @@ class SymfonyBundleGenerator implements IGenerator {
129128
pm?.subTask('Controller: Event listeners')
130129
'Generating Event listeners'.printIfNotTesting(fsa)
131130
new EventSubscribers().generate(it, fsa)
132-
pm?.subTask('Controller: Custom event definitions')
133-
'Generating custom event definitions'.printIfNotTesting(fsa)
134-
new Events().generate(it, fsa)
135131
pm?.subTask('Controller: Workflows')
136132
'Generating workflows'.printIfNotTesting(fsa)
137133
new Workflow().generate(it, fsa)

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/ControllerLayer.xtend‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class ControllerLayer {
8686

8787
public function __construct(
8888
TranslatorInterface $translator,
89+
protected readonly EntityFactory $entityFactory,
8990
«IF !getAllEntityFields.filter(StringField).filter[#[StringRole.COUNTRY, StringRole.CURRENCY, StringRole.LANGUAGE, StringRole.LOCALE, StringRole.TIME_ZONE].contains(role)].empty»
9091
protected readonly RequestStack $requestStack,
9192
«ENDIF»
@@ -113,6 +114,10 @@ class ControllerLayer {
113114
«method.generateMethod(it)»
114115
«ENDFOR»
115116

117+
public function createEntity(string $entityFqcn): «name.formatForCodeCapital»
118+
{
119+
return $this->entityFactory->create«name.formatForCodeCapital»();
120+
}
116121
«FOR action : actions»
117122
«actionImpl(action, true)»
118123

@@ -178,7 +183,8 @@ class ControllerLayer {
178183
'Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException',
179184
'function Symfony\\Component\\Translation\\t',
180185
'Symfony\\Contracts\\Translation\\TranslatorInterface',
181-
'Zikula\\CoreBundle\\Translation\\TranslatorTrait'
186+
'Zikula\\CoreBundle\\Translation\\TranslatorTrait',
187+
app.appNamespace + '\\Entity\\Factory\\EntityFactory'
182188
])
183189
if (hasIndexAction || hasEditAction) {
184190
imports.add('Exception')

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/Events.xtend‎

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

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/config/ConfigureFields.xtend‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,14 +547,14 @@ class ConfigureFields implements ControllerMethodInterface {
547547
def private dispatch titleAttribute(StringField it) '''«IF #[StringRole.COLOUR, StringRole.COUNTRY, StringRole.CURRENCY, StringRole.DATE_INTERVAL, StringRole.LANGUAGE, StringRole.LOCALE, StringRole.TIME_ZONE].contains(role)»Choose the «name.formatForDisplay»«ELSE»Enter the «name.formatForDisplay»«ENDIF» of the «entity.name.formatForDisplay».'''
548548
def private dispatch additionalAttributes(StringField it) '''
549549
'maxlength' => «length»,
550-
«IF role == StringRole.WEEK»
551-
'input' => 'string',
552-
«ENDIF»
553550
'''
554551
def private dispatch additionalOptions(StringField it) '''
555552
«IF unit != ''»
556553
'input_group' => ['right' => t('«unit»')],
557554
«ENDIF»
555+
«IF role == StringRole.COLOUR»
556+
'html5' => true,
557+
«ENDIF»
558558
«IF role == StringRole.DATE_INTERVAL»
559559
'labels' => [
560560
'years' => t('Years'),
@@ -584,8 +584,8 @@ class ConfigureFields implements ControllerMethodInterface {
584584
'with_minutes' => true,
585585
'with_seconds' => true,
586586
«ENDIF»
587-
«IF role == StringRole.COLOUR»
588-
'html5' => true,
587+
«IF role == StringRole.WEEK»
588+
'input' => 'string',
589589
«ENDIF»
590590
'''
591591

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/helper/ListEntriesHelper.xtend‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class ListEntriesHelper {
2727

2828
use Symfony\Contracts\Translation\TranslatorInterface;
2929
use Zikula\CoreBundle\Translation\TranslatorTrait;
30+
use function Symfony\Component\Translation\t;
3031

3132
/**
3233
* Helper base class for list field entries related methods.

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/menu/MenuBuilder.xtend‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ class MenuBuilder {
2424
val imports = new ImportList
2525
imports.addAll(#[
2626
'Symfony\\Bundle\\SecurityBundle\\Security',
27-
'Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface',
2827
'Symfony\\Component\\HttpFoundation\\RequestStack',
29-
appNamespace + '\\Event\\ItemActionsMenuPostConfigurationEvent',
30-
appNamespace + '\\Event\\ItemActionsMenuPreConfigurationEvent',
3128
appNamespace + '\\Helper\\PermissionHelper'
3229
])
3330
if ((!entities.filter[ownerPermission].empty && (hasEditActions || hasDeleteActions)) || !relations.empty) {
@@ -36,10 +33,6 @@ class MenuBuilder {
3633
for (entity : entities) {
3734
imports.add(appNamespace + '\\Entity\\' + entity.name.formatForCodeCapital)
3835
}
39-
if (hasIndexActions) {
40-
imports.add(appNamespace + '\\Event\\IndexActionsMenuPostConfigurationEvent')
41-
imports.add(appNamespace + '\\Event\\IndexActionsMenuPreConfigurationEvent')
42-
}
4336
if (hasDetailActions) {
4437
imports.add(appNamespace + '\\Helper\\EntityDisplayHelper')
4538
}
@@ -68,7 +61,6 @@ class MenuBuilder {
6861
6962
def private menuBuilderClassBaseImpl(Application it) '''
7063
public function __construct(
71-
protected readonly EventDispatcherInterface $eventDispatcher,
7264
protected readonly RequestStack $requestStack,
7365
protected readonly PermissionHelper $permissionHelper,
7466
«IF hasDetailActions»
@@ -125,20 +117,12 @@ class MenuBuilder {
125117
«ENDIF»
126118
$menu->setChildrenAttribute('class', 'nav «actionType»-actions');
127119

128-
$this->eventDispatcher->dispatch(
129-
new «actionType.toFirstUpper»ActionsMenuPreConfigurationEvent($this->factory, $menu, $options)
130-
);
131-
132120
«IF 'item' == actionType»
133121
«new ItemActions().actionsImpl(it)»
134122
«ELSEIF 'index' == actionType»
135123
«new IndexActions().actionsImpl(it)»
136124
«ENDIF»
137125

138-
$this->eventDispatcher->dispatch(
139-
new «actionType.toFirstUpper»ActionsMenuPostConfigurationEvent($this->factory, $menu, $options)
140-
);
141-
142126
return $menu;
143127
}
144128
'''

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/models/EntityInitializer.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class EntityInitializer {
7474
/**
7575
* Initialises a given «entity.name.formatForCode» instance.
7676
*/
77-
public function init«entity.name.formatForCodeCapital»(«entity.name.formatForCodeCapital» $entity): «entity.name.formatForCodeCapital»Entity
77+
public function init«entity.name.formatForCodeCapital»(«entity.name.formatForCodeCapital» $entity): «entity.name.formatForCodeCapital»
7878
{
7979
«FOR field : entity.getLanguageFieldsEntity + entity.getLocaleFieldsEntity»
8080
$entity->set«field.name.formatForCodeCapital»($this->requestStack->getCurrentRequest()->getLocale());
@@ -102,7 +102,7 @@ class EntityInitializer {
102102
$items[] = $listEntry['value'];
103103
}
104104
}
105-
$entity->set«listField.name.formatForCodeCapital»(implode('###', $items));
105+
$entity->set«listField.name.formatForCodeCapital»($items);
106106
«ENDIF»
107107

108108
«ENDFOR»

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/models/Factory.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ class Factory {
8888
/**
8989
* Creates a new «entity.name.formatForCode» instance.
9090
*/
91-
public function create«entity.name.formatForCodeCapital»(): «entity.name.formatForCodeCapital»Entity
91+
public function create«entity.name.formatForCodeCapital»(): «entity.name.formatForCodeCapital»
9292
{
93-
$entity = new «entity.name.formatForCodeCapital»Entity(«/* TODO provide entity constructor arguments if required */»);
93+
$entity = new «entity.name.formatForCodeCapital»(«/* TODO provide entity constructor arguments if required */»);
9494
9595
$this->entityInitializer->init«entity.name.formatForCodeCapital»($entity);
9696

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class TreeSelection {
1313
/**
1414
* The «appName.formatForDB»_treeSelection function retrieves tree entities based on a given one.
1515
*/
16-
#[AsTwigFunction('«appName.toLowerCase»_treeSelection)]
16+
#[AsTwigFunction('«appName.toLowerCase»_treeSelection')]
1717
public function getTreeSelection(
1818
string $objectType,
1919
EntityInterface $node,

0 commit comments

Comments
 (0)