remove some obsolete DSL properties

Guite · Jun 27, 2024 · 6aca097 · 6aca097
1 parent 42fcf07
commit 6aca097
Show file tree

Hide file tree

Showing 39 changed files with 24 additions and 1,486 deletions.
diff --git a/...ulestudio.generator/src/org/zikula/modulestudio/generator/application/WorkflowStart.xtend b/...ulestudio.generator/src/org/zikula/modulestudio/generator/application/WorkflowStart.xtend
@@ -161,12 +161,10 @@ class WorkflowStart {
         settings.appVersion = if (null !== app.version) app.version else '1.0.0' //$NON-NLS-1$
 
         // compute destination path for model files
-        if (app.writeModelToDocs) {
-            //modelDestinationPath = File.separator + 'symfony' + File.separator + settings.appName + File.separator
-            var modelDestinationPath = settings.getPathToBundleRoot
-            modelDestinationPath += 'Resources' + File.separator + 'docs' + File.separator + 'model' + File.separator //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            settings.modelDestinationPath = modelDestinationPath
-        }
+        //modelDestinationPath = File.separator + 'symfony' + File.separator + settings.appName + File.separator
+        var modelDestinationPath = settings.getPathToBundleRoot
+        modelDestinationPath += 'Resources' + File.separator + 'docs' + File.separator + 'model' + File.separator //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        settings.modelDestinationPath = modelDestinationPath
 
         return
     }

diff --git a/...rc/org/zikula/modulestudio/generator/cartridges/symfony/controller/ControllerAction.xtend b/...rc/org/zikula/modulestudio/generator/cartridges/symfony/controller/ControllerAction.xtend
@@ -8,10 +8,10 @@ import de.guite.modulestudio.metamodel.DetailAction
 import de.guite.modulestudio.metamodel.EditAction
 import de.guite.modulestudio.metamodel.Entity
 import de.guite.modulestudio.metamodel.IndexAction
+import org.zikula.modulestudio.generator.cartridges.symfony.controller.action.ActionRoute
 import org.zikula.modulestudio.generator.cartridges.symfony.controller.action.Actions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
-import org.zikula.modulestudio.generator.cartridges.symfony.controller.action.ActionRoute
 
 class ControllerAction {
 
@@ -22,7 +22,7 @@ class ControllerAction {
     Actions actionsImpl
 
     new(Application app) {
-        routeAnnotation = new ActionRoute(app)
+        routeAnnotation = new ActionRoute()
         actionsImpl = new Actions(app)
     }
 

diff --git a/.../org/zikula/modulestudio/generator/cartridges/symfony/controller/ServiceDefinitions.xtend b/.../org/zikula/modulestudio/generator/cartridges/symfony/controller/ServiceDefinitions.xtend
@@ -97,16 +97,6 @@ class ServiceDefinitions {
                 «IF hasIndexActions»
                 - { name: knp_menu.menu_builder, method: createViewActionsMenu, alias: «vendorAndName.toFirstLower»MenuViewActions }
                 «ENDIF»
-        «IF !getAllEntities.filter[hasIpTraceableFields].empty»
-
-            gedmo_doctrine_extensions.listener.ip_traceable:
-                class: Gedmo\IpTraceable\IpTraceableListener
-                public: false
-                calls:
-                    - setAnnotationReader: ['@annotation_reader']
-                tags:
-                    - { name: doctrine.event_subscriber, connection: default }
-        «ENDIF»
         «IF hasSluggable»
 
             stof_doctrine_extensions.listener.sluggable:

diff --git a/.../org/zikula/modulestudio/generator/cartridges/symfony/controller/action/ActionRoute.xtend b/.../org/zikula/modulestudio/generator/cartridges/symfony/controller/action/ActionRoute.xtend
@@ -1,7 +1,6 @@
 package org.zikula.modulestudio.generator.cartridges.symfony.controller.action
 
 import de.guite.modulestudio.metamodel.Action
-import de.guite.modulestudio.metamodel.Application
 import de.guite.modulestudio.metamodel.CustomAction
 import de.guite.modulestudio.metamodel.DeleteAction
 import de.guite.modulestudio.metamodel.DetailAction
@@ -13,21 +12,13 @@ import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
 import org.zikula.modulestudio.generator.extensions.ModelExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
-import org.zikula.modulestudio.generator.extensions.ViewExtensions
 
 class ActionRoute {
 
     extension FormattingExtensions = new FormattingExtensions
     extension ModelBehaviourExtensions = new ModelBehaviourExtensions
     extension ModelExtensions = new ModelExtensions
     extension Utils = new Utils
-    extension ViewExtensions = new ViewExtensions
-
-    Application app
-
-    new(Application app) {
-        this.app = app
-    }
 
     def generate(Action it) '''
         «actionRoute(false)»
@@ -40,7 +31,7 @@ class ActionRoute {
     def private dispatch actionRoute(IndexAction it, Boolean isAdmin) '''
         #[Route('«IF isAdmin»/admin«ENDIF»/«entity.nameMultiple.formatForCode»/view/{sort}/{sortdir}/{page}/{num}.{_format}',
             name: '«entity.application.appName.formatForDB»«IF isAdmin»_admin«ENDIF»_«entity.name.formatForDB»_index',
-            requirements: ['sortdir' => 'asc|desc|ASC|DESC', 'page' => '\d+', 'num' => '\d+', '_format' => 'html«IF app.getListOfViewFormats.size > 0»|«app.getListOfViewFormats.join('|')»«ENDIF»'],
+            requirements: ['sortdir' => 'asc|desc|ASC|DESC', 'page' => '\d+', 'num' => '\d+', '_format' => 'html'],
             defaults: ['sort' => '', 'sortdir' => 'asc', 'page' => 1, 'num' => 10, '_format' => 'html'],
             methods: ['GET']
         )]
@@ -49,7 +40,7 @@ class ActionRoute {
     def private actionRouteForSingleEntity(Entity it, Action action, Boolean isAdmin) '''
         #[Route('«IF isAdmin»/admin«ENDIF»/«name.formatForCode»/«IF !(action instanceof DetailAction)»«action.name.formatForCode»/«ENDIF»«actionRouteParamsForSingleEntity(action)».{_format}',
             name: '«application.appName.formatForDB»«IF isAdmin»_admin«ENDIF»_«name.formatForDB»_detail',
-            requirements: [«actionRouteRequirementsForSingleEntity(action)», '_format' => 'html«IF action instanceof DetailAction && app.getListOfDisplayFormats.size > 0»|«app.getListOfDisplayFormats.join('|')»«ENDIF»'],
+            requirements: [«actionRouteRequirementsForSingleEntity(action)», '_format' => 'html'],
             defaults: [«IF action instanceof EditAction»«actionRouteDefaultsForSingleEntity(action)», «ENDIF»'_format' => 'html'],
             methods: ['GET'«IF action instanceof EditAction || action instanceof DeleteAction», 'POST'«ENDIF»]«IF tree != EntityTreeType.NONE»,
             options: ['expose' => true]«ENDIF»

diff --git a/.../src/org/zikula/modulestudio/generator/cartridges/symfony/controller/action/Actions.xtend b/.../src/org/zikula/modulestudio/generator/cartridges/symfony/controller/action/Actions.xtend
@@ -11,15 +11,13 @@ import de.guite.modulestudio.metamodel.EntityTreeType
 import de.guite.modulestudio.metamodel.EntityWorkflowType
 import de.guite.modulestudio.metamodel.IndexAction
 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.ModelBehaviourExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
 
 class Actions {
 
     extension ControllerExtensions = new ControllerExtensions
-    extension DateTimeExtensions = new DateTimeExtensions
     extension FormattingExtensions = new FormattingExtensions
     extension ModelBehaviourExtensions = new ModelBehaviourExtensions
     extension Utils = new Utils
@@ -170,21 +168,7 @@ class Actions {
 
     def private processDisplayOutput(Entity it) '''
         // fetch and return the appropriate template
-        $response = $viewHelper->processTemplate($objectType, 'detail', $templateParameters);
-        «IF app.generateIcsTemplates && hasStartAndEndDateField»
-
-            if ('ics' === $request->getRequestFormat()) {
-                $fileName = $objectType . '_' .
-                    (property_exists($«name.formatForCode», 'slug')
-                        ? $«name.formatForCode»['slug']
-                        : $this->entityDisplayHelper->getFormattedTitle($«name.formatForCode»)
-                    ) . '.ics'
-                ;
-                $response->headers->set('Content-Disposition', 'attachment; filename=' . $fileName);
-            }
-        «ENDIF»
-
-        return $response;
+        return $viewHelper->processTemplate($objectType, 'detail', $templateParameters);
     '''
 
     def private dispatch actionImplBody(Entity it, EditAction action) '''

diff --git a/...zikula/modulestudio/generator/cartridges/symfony/controller/action/LoggableUndelete.xtend b/...zikula/modulestudio/generator/cartridges/symfony/controller/action/LoggableUndelete.xtend
@@ -2,15 +2,13 @@ package org.zikula.modulestudio.generator.cartridges.symfony.controller.action
 
 import de.guite.modulestudio.metamodel.Entity
 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.ModelBehaviourExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
 
 class LoggableUndelete {
 
     extension ControllerExtensions = new ControllerExtensions
-    extension DateTimeExtensions = new DateTimeExtensions
     extension FormattingExtensions = new FormattingExtensions
     extension ModelBehaviourExtensions = new ModelBehaviourExtensions
     extension Utils = new Utils
@@ -58,9 +56,6 @@ class LoggableUndelete {
         ViewHelper $viewHelper,
         EntityFactory $entityFactory,
         LoggableHelper $loggableHelper,
-        «IF application.generateIcsTemplates && hasStartAndEndDateField»
-            EntityDisplayHelper $entityDisplayHelper,
-        «ENDIF»
         «IF hasTranslatableFields»
             TranslatableHelper $translatableHelper,
         «ENDIF»
@@ -95,9 +90,6 @@ class LoggableUndelete {
                     $viewHelper,
                     $entityFactory,
                     $loggableHelper,
-                    «IF application.generateIcsTemplates && hasStartAndEndDateField»
-                        $entityDisplayHelper,
-                    «ENDIF»
                     $«name.formatForCode»,
                     null
                 );

diff --git a/.../zikula/modulestudio/generator/cartridges/symfony/controller/config/ConfigureFields.xtend b/.../zikula/modulestudio/generator/cartridges/symfony/controller/config/ConfigureFields.xtend
@@ -209,11 +209,6 @@ class ConfigureFields implements ControllerMethodInterface {
         if (entity.hasIndexAction && !visibleOnSort) {
             calls += '->setSortable(false)'
         }
-        if (entity.hasEditAction) {
-            if (null !== cssClass && !cssClass.empty) {
-                calls += '''->setColumns('«cssClass»')'''
-            }
-        }
         calls
     }