Fixes #238. Money type is usable in show action.

Also refactored the complete columns, to remove code duplication
such that this same error is prevented the next time.

Author: bobvandevijver

Resources/templates/CommonAdmin/ListTemplate/column.php.twig

@@ -1,30 +1,7 @@
-{% use '../CommonAdmin/ListTemplate/Column/boolean.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/date.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/datetime.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/money.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/decimal.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/collection.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/columns.php.twig' %}
 
 {% block column_default %}
     {{ echo_block('list_td_column_' ~ column.name) -}}
-        {%- if column.customView != null and builder.variable('custom_blocks') != null -%}
-            {{- echo_use(builder.variable('custom_blocks')) -}}
-            {{- echo_set('field_value', builder.ModelClass ~ '.' ~ column.getter, false) -}}
-            {{- echo_print_block('column_' ~ column.customView|lower) -}}
-        {%- elseif column.dbType|lower == "boolean" -%}
-            {{- block('column_boolean') -}}
-        {%- elseif column.dbType|lower == "date" -%}
-            {{- block('column_date') -}}
-        {%- elseif (column.dbType|lower == "datetime") or (column.dbType|lower == "timestamp") or (column.dbType|lower == "vardatetime") or (column.dbType|lower == "datetimetz") -%}
-            {{- block('column_datetime') -}}
-        {%- elseif column.formType|lower == "money" -%}
-            {{- block('column_money') -}}
-        {%- elseif column.dbType|lower == "decimal" -%}
-            {{- block('column_decimal') -}}
-        {%- elseif (column.dbType|lower == "array") or (column.dbType|lower == "collection")  -%}
-            {{- block('column_collection') -}}
-        {%- else -%}
-            {{- echo_twig(builder.ModelClass ~ '.' ~ column.getter) -}}
-        {%- endif -%}
+        {{- block('printable_columns') -}}
     {{- echo_endblock() }}
 {% endblock %}

Resources/templates/CommonAdmin/ListTemplate/Column/boolean.php.twig renamed to Resources/templates/CommonAdmin/PrintableColumns/boolean.php.twig

@@ -0,0 +1,28 @@
+{% use '../CommonAdmin/PrintableColumns/boolean.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/date.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/datetime.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/money.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/decimal.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/collection.php.twig' %}
+
+{% block printable_columns %}
+  {%- if column.customView != null and builder.variable('custom_blocks') != null -%}
+    {{- echo_use(builder.variable('custom_blocks')) -}}
+    {{- echo_set('field_value', builder.ModelClass ~ '.' ~ column.getter, false) -}}
+    {{- echo_print_block('column_' ~ column.customView|lower) -}}
+  {%- elseif column.dbType|lower == "boolean" -%}
+    {{- block('column_boolean') -}}
+  {%- elseif column.dbType|lower == "date" -%}
+    {{- block('column_date') -}}
+  {%- elseif (column.dbType|lower == "datetime") or (column.dbType|lower == "timestamp") or (column.dbType|lower == "vardatetime") or (column.dbType|lower == "datetimetz") -%}
+    {{- block('column_datetime') -}}
+  {%- elseif column.formType|lower == "money" -%}
+    {{- block('column_money') -}}
+  {%- elseif column.dbType|lower == "decimal" -%}
+    {{- block('column_decimal') -}}
+  {%- elseif (column.dbType|lower == "array") or (column.dbType|lower == "collection")  -%}
+    {{- block('column_collection') -}}
+  {%- else -%}
+    {{- echo_twig(builder.ModelClass ~ '.' ~ column.getter) -}}
+  {%- endif -%}
+{% endblock %}

Resources/templates/CommonAdmin/ListTemplate/Column/collection.php.twig renamed to Resources/templates/CommonAdmin/PrintableColumns/collection.php.twig

@@ -1,27 +1,7 @@
-{% use '../CommonAdmin/ListTemplate/Column/boolean.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/date.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/datetime.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/decimal.php.twig' %}
-{% use '../CommonAdmin/ListTemplate/Column/collection.php.twig' %}
+{% use '../CommonAdmin/PrintableColumns/columns.php.twig' %}
 
 {% block show_column %}
     {{ echo_block('show_column_' ~ column.name) -}}
-        {%- if column.customView != null and builder.variable('custom_blocks') != null -%}
-            {{- echo_use(builder.variable('custom_blocks')) -}}
-            {{- echo_set('field_value', builder.ModelClass ~ '.' ~ column.getter, false) -}}
-            {{- echo_print_block('column_' ~ column.customView|lower) -}}
-        {%- elseif column.dbType|lower == "boolean" -%}
-            {{- block('column_boolean') -}}
-        {%- elseif column.dbType|lower == "date" -%}
-            {{- block('column_date') -}}
-        {%- elseif (column.dbType|lower == "datetime") or (column.dbType|lower == "timestamp") or (column.dbType|lower == "vardatetime") or (column.dbType|lower == "datetimetz") -%}
-            {{- block('column_datetime') -}}
-        {%- elseif column.dbType|lower == "decimal" -%}
-            {{- block('column_decimal') -}}
-        {%- elseif (column.dbType|lower == "array") or (column.dbType|lower == "collection")  -%}
-            {{- block('column_collection') -}}
-        {%- else -%}
-            {{- echo_twig(builder.ModelClass ~ '.' ~ column.getter) -}}
-        {%- endif -%}
+        {{- block('printable_columns') -}}
     {{- echo_endblock() }}
 {% endblock %}