get rid of old field display template

Author: Guite

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

@@ -344,6 +344,9 @@ class ConfigureFields implements ControllerMethodInterface {
             // setRoundingMode()
             // setThousandsSeparator()
         }
+        if (entity.geographical && #['latitude', 'longitude'].contains(name)) {
+            calls += '''->setTemplatePath('@EasyAdmin/crud/field/geo.html.twig')'''
+        }
         calls
     }
 
@@ -452,6 +455,7 @@ class ConfigureFields implements ControllerMethodInterface {
     def private dispatch options(UserField it) {
         var calls = commonOptions
         calls += '''->autocomplete()'''
+        calls += '''->setTemplatePath('@EasyAdmin/crud/field/user.html.twig')'''
         // TODO association options
         calls
     }

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

@@ -3,7 +3,6 @@ package org.zikula.modulestudio.generator.cartridges.symfony.view
 import de.guite.modulestudio.metamodel.Application
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.application.ImportList
-import org.zikula.modulestudio.generator.cartridges.symfony.view.plugin.FormatGeoData
 import org.zikula.modulestudio.generator.cartridges.symfony.view.plugin.GetFormattedEntityTitle
 import org.zikula.modulestudio.generator.cartridges.symfony.view.plugin.GetListEntry
 import org.zikula.modulestudio.generator.cartridges.symfony.view.plugin.GetLogDescription
@@ -128,9 +127,6 @@ class Plugins {
         if (hasListFields) {
             result += new GetListEntry().generate(it)
         }
-        if (hasGeographical) {
-            result += new FormatGeoData().generate(it)
-        }
         if (hasTrees) {
             result += new TreeData().generate(it)
             result += new TreeSelection().generate(it)

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/pagecomponents/SimpleFields.xtend

@@ -9,7 +9,6 @@ import de.guite.modulestudio.metamodel.Relationship
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.MenuViews
 import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.Relations
-import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.SimpleFields
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
@@ -194,9 +193,8 @@ class Detail {
         <dd>«displayEntryImpl»</dd>
     '''
 
-    def private displayEntryImpl(Field it) {
-        new SimpleFields().displayField(it, entity.name.formatForCode, 'detail')
-    }
+    def private displayEntryImpl(Field it) '''
+        {{ «entity.name.formatForCode».«name.formatForCode» }}'''
 
     def private displayEntry(Relationship it, Boolean useTarget) '''
         «val relationAliasName = getRelationAliasName(useTarget).formatForCode»

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

@@ -13,7 +13,6 @@ import java.util.List
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.IndexPagesHelper
 import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.MenuViews
-import org.zikula.modulestudio.generator.cartridges.symfony.view.pagecomponents.SimpleFields
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
@@ -32,7 +31,6 @@ class ViewTable {
     extension UrlExtensions = new UrlExtensions
     extension Utils = new Utils
 
-    SimpleFields fieldHelper = new SimpleFields
     String appName
 
     def generate(Entity it, String appName, IMostFileSystemAccess fsa) {
@@ -200,18 +198,14 @@ class ViewTable {
     }
 
     def private dispatch displayEntryInner(Field it, Boolean useTarget) '''
-        «IF #['name', 'title'].contains(name)»
-            «IF entity.hasDetailAction»
-                <a href="{{ path('«application.appName.formatForDB»_«entity.name.formatForDB»_detail'«entity.routeParams(entity.name.formatForCode, true)») }}" title="{{ 'View detail page'|trans({}, 'messages')|e('html_attr') }}">«displayLeadingEntry»</a>
-            «ELSE»
-                «displayLeadingEntry»
-            «ENDIF»
+        «IF entity.hasDetailAction && #['name', 'title'].contains(name)»
+            <a href="{{ path('«application.appName.formatForDB»_«entity.name.formatForDB»_detail'«entity.routeParams(entity.name.formatForCode, true)») }}" title="{{ 'View detail page'|trans({}, 'messages')|e('html_attr') }}">«displayField»</a>
         «ELSE»
-            «fieldHelper.displayField(it, entity.name.formatForCode, 'index')»
+            «displayField»
         «ENDIF»
     '''
 
-    def private displayLeadingEntry(Field it) {
+    def private displayField(Field it) {
         '''{{ «entity.name.formatForCode».«name.formatForCode» }}'''
     }
 

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

@@ -79,7 +79,7 @@ class ViewExtensions {
         «IF 'index' == actionName»
             <div id="geographicalInfo" class="d-none" data-context="«actionName»" data-object-type="«objName»" data-tile-layer-url="{{ geoConfig.tile_layer_url|e('html_attr') }}" data-tile-layer-attribution="{{ geoConfig.tile_layer_attribution|e('html_attr') }}"></div>
         «ELSE»
-            <div id="geographicalInfo" class="d-none" data-context="«actionName»" data-latitude="{{ «objName».latitude|«application.appName.formatForDB»_geoData }}" data-longitude="{{ «objName».longitude|«application.appName.formatForDB»_geoData }}" data-zoom-level="{{ geoConfig.default_zoom_level|e('html_attr') }}" data-tile-layer-url="{{ geoConfig.tile_layer_url|e('html_attr') }}" data-tile-layer-attribution="{{ geoConfig.tile_layer_attribution|e('html_attr') }}"«IF actionName == 'edit'» data-use-geolocation="{% if mode == 'create' and geoConfig.enable_«name.formatForSnakeCase»_geo_location %}true{% else %}false{% endif %}"«ENDIF»></div>
+            <div id="geographicalInfo" class="d-none" data-context="«actionName»" data-latitude="{{ «objName».latitude|formatCoordinate }}" data-longitude="{{ «objName».longitude|formatCoordinate }}" data-zoom-level="{{ geoConfig.default_zoom_level|e('html_attr') }}" data-tile-layer-url="{{ geoConfig.tile_layer_url|e('html_attr') }}" data-tile-layer-attribution="{{ geoConfig.tile_layer_attribution|e('html_attr') }}"«IF actionName == 'edit'» data-use-geolocation="{% if mode == 'create' and geoConfig.enable_«name.formatForSnakeCase»_geo_location %}true{% else %}false{% endif %}"«ENDIF»></div>
         «ENDIF»
 
     '''