feature #583 Added lots of missing templates for advanced Doctrine ty…

…pes (json_array, object, guid) (javiereguiluz) This PR was squashed before being merged into the master branch (closes #583). Discussion ---------- Added lots of missing templates for advanced Doctrine types (json_array, object, guid) These types are rarely used, but still we should support everything. This is how it looks in the `list` view: ![list_view](https://cloud.githubusercontent.com/assets/73419/11317989/67cf778e-9041-11e5-9401-5c3dbdbab978.png) And this is how it looks in the `show` view: ![show_view](https://cloud.githubusercontent.com/assets/73419/11317990/6a71ecc4-9041-11e5-952f-2de684328311.png) Commits ------- 362e1ae Added lots of missing templates for advanced Doctrine types (json_array, object, guid)
EasyCorp · Nov 21, 2015 · 88ce1f3 · 88ce1f3
2 parents e3e54fb + 362e1ae
commit 88ce1f3
Show file tree

Hide file tree

Showing 124 changed files with 421 additions and 0 deletions.
diff --git a/DependencyInjection/EasyAdminExtension.php b/DependencyInjection/EasyAdminExtension.php
@@ -56,9 +56,12 @@ class EasyAdminExtension extends Extension
         'field_datetimetz' => '@EasyAdmin/default/field_datetimetz.html.twig',
         'field_decimal' => '@EasyAdmin/default/field_decimal.html.twig',
         'field_float' => '@EasyAdmin/default/field_float.html.twig',
+        'field_guid' => '@EasyAdmin/default/field_guid.html.twig',
         'field_id' => '@EasyAdmin/default/field_id.html.twig',
         'field_image' => '@EasyAdmin/default/field_image.html.twig',
+        'field_json_array' => '@EasyAdmin/default/field_json_array.html.twig',
         'field_integer' => '@EasyAdmin/default/field_integer.html.twig',
+        'field_object' => '@EasyAdmin/default/field_object.html.twig',
         'field_raw' => '@EasyAdmin/default/field_raw.html.twig',
         'field_simple_array' => '@EasyAdmin/default/field_simple_array.html.twig',
         'field_smallint' => '@EasyAdmin/default/field_smallint.html.twig',

diff --git a/Resources/translations/EasyAdminBundle.en.xlf b/Resources/translations/EasyAdminBundle.en.xlf
@@ -75,6 +75,10 @@
                 <source>label.null</source>
                 <target>Null</target>
             </trans-unit>
+            <trans-unit id="label.object">
+                <source>label.object</source>
+                <target>PHP Object</target>
+            </trans-unit>
             <trans-unit id="label.inaccessible">
                 <source>label.inaccessible</source>
                 <target>Inaccessible</target>

diff --git a/Resources/translations/EasyAdminBundle.es.xlf b/Resources/translations/EasyAdminBundle.es.xlf
@@ -75,6 +75,10 @@
                 <source>label.null</source>
                 <target>Null</target>
             </trans-unit>
+            <trans-unit id="label.object">
+                <source>label.object</source>
+                <target>Objecto PHP</target>
+            </trans-unit>
             <trans-unit id="label.inaccessible">
                 <source>label.inaccessible</source>
                 <target>Inaccessible</target>

diff --git a/Resources/views/default/field_guid.html.twig b/Resources/views/default/field_guid.html.twig
@@ -0,0 +1,5 @@
+{% if view == 'show' %}
+    {{ value }}
+{% else %}
+    {{ value|easyadmin_truncate(7) }}
+{% endif %}
diff --git a/Resources/views/default/field_json_array.html.twig b/Resources/views/default/field_json_array.html.twig
@@ -0,0 +1,5 @@
+{% if view == 'show' %}
+    {{ value|nl2br }}
+{% else %}
+    {{ value|join(', ')|easyadmin_truncate }}
+{% endif %}
diff --git a/Resources/views/default/field_object.html.twig b/Resources/views/default/field_object.html.twig
@@ -0,0 +1 @@
+<span class="label">{{ 'label.object'|trans(domain = 'EasyAdminBundle') }}</span>
diff --git a/Resources/views/default/fild_guid.html.twig b/Resources/views/default/fild_guid.html.twig
diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'
@@ -224,9 +227,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'
@@ -224,9 +227,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'
@@ -343,9 +349,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'
@@ -224,9 +227,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'
@@ -224,9 +227,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'

diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml
@@ -105,9 +105,12 @@ easy_admin:
                 field_datetimetz: '@EasyAdmin/default/field_datetimetz.html.twig'
                 field_decimal: '@EasyAdmin/default/field_decimal.html.twig'
                 field_float: '@EasyAdmin/default/field_float.html.twig'
+                field_guid: '@EasyAdmin/default/field_guid.html.twig'
                 field_id: '@EasyAdmin/default/field_id.html.twig'
                 field_image: '@EasyAdmin/default/field_image.html.twig'
+                field_json_array: '@EasyAdmin/default/field_json_array.html.twig'
                 field_integer: '@EasyAdmin/default/field_integer.html.twig'
+                field_object: '@EasyAdmin/default/field_object.html.twig'
                 field_raw: '@EasyAdmin/default/field_raw.html.twig'
                 field_simple_array: '@EasyAdmin/default/field_simple_array.html.twig'
                 field_smallint: '@EasyAdmin/default/field_smallint.html.twig'