cosmetics

Author: Guite

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

@@ -1,24 +1,18 @@
 package org.zikula.modulestudio.generator.cartridges.symfony.controller.config
 
-import de.guite.modulestudio.metamodel.ArrayField
-import de.guite.modulestudio.metamodel.BooleanField
 import de.guite.modulestudio.metamodel.DatetimeField
 import de.guite.modulestudio.metamodel.Entity
-import de.guite.modulestudio.metamodel.Field
-import de.guite.modulestudio.metamodel.UserField
 import org.zikula.modulestudio.generator.cartridges.symfony.controller.ControllerMethodInterface
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
 import org.zikula.modulestudio.generator.extensions.DateTimeExtensions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
-import org.zikula.modulestudio.generator.extensions.ModelExtensions
 import org.zikula.modulestudio.generator.extensions.NamingExtensions
 
 class ConfigureCrud implements ControllerMethodInterface {
 
     extension ControllerExtensions = new ControllerExtensions
     extension DateTimeExtensions = new DateTimeExtensions
     extension FormattingExtensions = new FormattingExtensions
-    extension ModelExtensions = new ModelExtensions
     extension NamingExtensions = new NamingExtensions
 
     Iterable<DatetimeField> dateTimeFields
@@ -86,16 +80,6 @@ class ConfigureCrud implements ControllerMethodInterface {
         «IF !dateTimeFields.empty»
             ->setTimezone('Europe/Berlin')
         «ENDIF»
-        // ->setSearchFields(['«FOR field : allEntityFields.filter[f|f.isContainedInSearch] SEPARATOR '\', \''»«field.name.formatForCode»«ENDFOR»'])
         ->addFormTheme('@ZikulaTheme/Form/form_layout_addons.html.twig')
     '''
-
-    def private isContainedInSearch(Field it) {
-        switch it {
-            BooleanField: false
-            UserField: false
-            ArrayField: false
-            default: true
-        }
-    }
 }

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

@@ -562,7 +562,7 @@ class ConfigureFields implements ControllerMethodInterface {
         «IF NumberFieldType.INTEGER != numberType»
             'scale' => «scale»,
         «ENDIF»
-        «IF unit != ''»
+        «IF unit != '' && !#[NumberRole.MONEY, NumberRole.PERCENTAGE].contains(role)»
             'input_group' => ['right' => t('«unit»')],
         «ENDIF»
     '''
@@ -677,7 +677,7 @@ class ConfigureFields implements ControllerMethodInterface {
         «val aliasName = getRelationAliasName(outgoing)»
         «val editMode = if (outgoing) getSourceEditMode else getTargetEditMode»
         yield '«aliasName.formatForCode»' => «relationFieldType(outgoing)»Field::new('«aliasName.formatForCode»', t('«aliasName.formatForDisplayCapital»'))«IF RelationEditMode.NONE === editMode»->hideOnForm()«ENDIF»«/*
-            «IF !visibility(entity as Entity).empty»
+            «TODO IF !visibility(entity as Entity).empty»
                 «visibility(entity as Entity)»
             «ENDIF*/»
             «IF !options(outgoing, relationFieldType(outgoing), autoComplete).empty»