Fix export of boolean values in list and export and extend list searc…

…h for id (#132) * fix export of boolean values in list and export * Add changelog
sulu · Dec 11, 2017 · a6a9dd2 · a6a9dd2
1 parent 07fe4c6
commit a6a9dd2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 1.0.0-RC2
 
+ - BUGFIX      #132    Fix boolean values in list
+ - FEATURE     #132    Add id to search fields in form and dynamic list
  - ENHANCEMENT #131    Add created date to list view
  - BUGFIX      #130    Fixed csv export for big results
  - FEATURE     #129    Add disabled field type configuration

diff --git a/ListBuilder/DynamicListBuilder.php b/ListBuilder/DynamicListBuilder.php
@@ -84,10 +84,6 @@ public function build(Dynamic $dynamic, $locale)
      */
     protected function toString($value)
     {
-        if (!$value) {
-            return '';
-        }
-
         if (is_string($value) || is_numeric($value)) {
             return $value;
         }
@@ -100,6 +96,10 @@ protected function toString($value)
             return $value->format('c');
         }
 
+        if (!$value) {
+            return '';
+        }
+
         if (!is_array($value)) {
             throw new \Exception('Invalid value for list builder.');
         }

diff --git a/ListBuilder/DynamicListFactory.php b/ListBuilder/DynamicListFactory.php
@@ -53,11 +53,10 @@ public function getFieldDescriptors(Form $form, $locale)
             }
 
             $title = '';
-
             $translation = $field->getTranslation($locale);
 
             if ($translation) {
-                $title = $translation->getTitle();
+                $title = $translation->getShortTitle() ?: $translation->getTitle();
             }
 
             $fieldDescriptors[$field->getKey()] = new FieldDescriptor(

diff --git a/Resources/public/dist/components/dynamics/list/main.js b/Resources/public/dist/components/dynamics/list/main.js
diff --git a/Resources/public/dist/components/forms/list/main.js b/Resources/public/dist/components/forms/list/main.js
diff --git a/Resources/public/js/components/dynamics/list/main.js b/Resources/public/js/components/dynamics/list/main.js
@@ -184,7 +184,7 @@ define(['jquery'], function ($) {
                     instanceName: this.instanceName,
                     url: constants.endPointUrl + queryString,
                     resultKey: 'dynamics',
-                    searchFields: ['email', 'firstName', 'lastName'],
+                    searchFields: ['id', 'email', 'firstName', 'lastName'],
                     viewOptions: {
                         table: {
                             selectItem: false,

diff --git a/Resources/public/js/components/forms/list/main.js b/Resources/public/js/components/forms/list/main.js
@@ -14,7 +14,7 @@ define(['suluform/collections/forms'], function (Collection) {
         lastClickedEventSettingsKey: 'suluformformLastClicked',
         endPointUrl: collection.url(),
         toolbarKey: 'forms',
-        toolbarSearchFields: ['title'],
+        toolbarSearchFields: ['id', 'title'],
         fieldsAction: collection.fieldsUrl(),
         eventPrefix: 'sulu.form.forms.',
         translatePrefix: 'sulu_form.forms.'