Skip to content

Commit 205cc06

Browse files
committed
further simplifications
1 parent 507d554 commit 205cc06

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,15 @@ class ItemActions {
180180
'''
181181
182182
def private itemActionsForEditAction(Entity it) '''
183-
«IF !readOnly»«/*create is allowed, but editing not*/»
184-
$menu->addChild('Edit', [
185-
'route' => $routePrefix . 'edit',
186-
'routeParameters' => $entity->createUrlArgs(«IF hasSluggableFields && slugUnique»true«ENDIF»),
187-
])
188-
->setLinkAttribute('title', 'Edit this «name.formatForDisplay»')
189-
«application.addLinkClass('secondary'
190-
«application.addIcon('edit'
191-
->setExtra('translation_domain', '«name.formatForCode»')
192-
;
193-
«ENDIF»
183+
$menu->addChild('Edit', [
184+
'route' => $routePrefix . 'edit',
185+
'routeParameters' => $entity->createUrlArgs(«IF hasSluggableFields && slugUnique»true«ENDIF»),
186+
])
187+
->setLinkAttribute('title', 'Edit this «name.formatForDisplay»')
188+
«application.addLinkClass('secondary'
189+
«application.addIcon('edit'
190+
->setExtra('translation_domain', '«name.formatForCode»')
191+
;
194192
$menu->addChild('Reuse', [
195193
'route' => $routePrefix . 'edit',
196194
'routeParameters' => ['astemplate' => $entity->getKey()],

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.zikula.modulestudio.generator.cartridges.symfony.models
33
import de.guite.modulestudio.metamodel.Application
44
import de.guite.modulestudio.metamodel.ArrayField
55
import de.guite.modulestudio.metamodel.Entity
6-
import de.guite.modulestudio.metamodel.EntityChangeTrackingPolicy
76
import de.guite.modulestudio.metamodel.EntityTreeType
87
import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
98
import org.zikula.modulestudio.generator.application.ImportList
@@ -262,17 +261,14 @@ class Entities {
262261
* This is the concrete entity class for «name.formatForDisplay» entities.
263262
*/
264263
«extMan.classAnnotations»
265-
#[ORM\Entity(repositoryClass: «name.formatForCodeCapital»Repository::class«IF readOnly», readOnly: true«ENDIF»)]
264+
#[ORM\Entity(repositoryClass: «name.formatForCodeCapital»Repository::class)]
266265
«entityImplClassAdditionalAttributes(app)»
267266
«new ValidationConstraints().classAnnotations(it
268267
'''
269268
270269
def private entityImplClassAdditionalAttributes(Entity it, Application app) '''
271270
#[ORM\Table(name: '«fullEntityTableName»')]
272271
«workflowIndex('Index'
273-
«IF changeTrackingPolicy != EntityChangeTrackingPolicy::DEFERRED_IMPLICIT»
274-
#[ORM\ChangeTrackingPolicy('«changeTrackingPolicy.literal»')]
275-
«ENDIF»
276272
'''
277273
278274
def private workflowIndex(Entity it, String indexType) '''

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/pages/view/ViewHierarchy.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class ViewHierarchy {
7272
</div>
7373
</div>
7474
<div class="clearfix">
75-
<div id="{{ idPrefix }}" class="tree-container" data-root-id="{{ rootId|e('html_attr') }}" data-object-type="«name.formatForCode»" data-urlargnames="«IF hasSluggableFields && slugUnique»slug«ELSE»«getPrimaryKey.name.formatForCode»«IF hasSluggableFields»,slug«ENDIF»«ENDIF»" data-has-detail="«hasDetailAction.displayBool»" data-has-edit="«(hasEditAction && !readOnly).displayBool»">
75+
<div id="{{ idPrefix }}" class="tree-container" data-root-id="{{ rootId|e('html_attr') }}" data-object-type="«name.formatForCode»" data-urlargnames="«IF hasSluggableFields && slugUnique»slug«ELSE»«getPrimaryKey.name.formatForCode»«IF hasSluggableFields»,slug«ENDIF»«ENDIF»" data-has-detail="«hasDetailAction.displayBool»" data-has-edit="«hasEditAction.displayBool»">
7676
{% if hasNodes %}
7777
{% set treeData = «appName.formatForDB»_treeData(objectType='«name.formatForCode»', tree=items, routeArea=routeArea, rootId=rootId) %}
7878
<ul id="itemTree{{ rootId|e('html_attr') }}">

0 commit comments

Comments
 (0)