further simplifications

Author: Guite

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

@@ -209,7 +209,6 @@ class ListEntriesHelper {
             'value' => '«IF null !== value»«value.replace("'", "")»«ELSE»«name.formatForCode.replace("'", "")»«ENDIF»',
             'text' => $this->trans('«name.toFirstUpper.replace("'", "")»'«IF !domain.empty», [], '«domain»'«ENDIF»),
             'title' => «IF null !== documentation && !documentation.empty»$this->trans('«documentation.replace("'", "")»'«IF !domain.empty», [], '«domain»'«ENDIF»)«ELSE»''«ENDIF»,
-            'image' => '«IF null !== image && !image.empty»«image»«ENDIF»',
             'default' => «^default.displayBool»,
         ];
     '''
@@ -219,7 +218,6 @@ class ListEntriesHelper {
             'value' => '!«IF null !== value»«value.replace("'", "")»«ELSE»«name.formatForCode.replace("'", "")»«ENDIF»',
             'text' => $this->trans('All except «name.toFirstLower.replace("'", "")»'«IF !domain.empty», [], '«domain»'«ENDIF»),
             'title' => $this->trans('Shows all items except these which are «name.formatForDisplay.replace("'", "")»'«IF !domain.empty», [], '«domain»'«ENDIF»),
-            'image' => '',
             'default' => false,
         ];
     '''

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/ModelExtensions.xtend

@@ -543,10 +543,10 @@ class ModelExtensions {
 
     /**
      * Returns the sub folder path segment for this upload field,
-     * that is either the subFolderName attribute (if set) or the name otherwise.
+     * that is actually field name by default.
      */
     def subFolderPathSegment(UploadField it) {
-        (if (null !== subFolderName && !subFolderName.empty) subFolderName else name).formatForDB
+        name.formatForCode
     }
 
     /**