Merge pull request #595 from eriktaubeneck/master

update render_field macro to accept a caller if desired

flask_admin/templates/bootstrap2/admin/lib.html

@@ -77,7 +77,7 @@
 {%- endmacro %}
 
 {# ---------------------- Forms -------------------------- #}
-{% macro render_field(form, field, kwargs={}) %}
+{% macro render_field(form, field, kwargs={}, caller=None) %}
   {% set direct_error = h.is_field_error(field.errors) %}
   <div class="control-group{{ ' error' if direct_error else '' }}">
     <div class="control-label">
@@ -104,6 +104,9 @@
       </ul>
     {% endif %}
     </div>
+    {% if caller %}
+      {{ caller(form, field, direct_error, kwargs) }}
+    {% endif %}
   </div>
 {% endmacro %}
 

flask_admin/templates/bootstrap3/admin/lib.html

@@ -75,7 +75,7 @@
 {%- endmacro %}
 
 {# ---------------------- Forms -------------------------- #}
-{% macro render_field(form, field, kwargs={}) %}
+{% macro render_field(form, field, kwargs={}, caller=None) %}
   {% set direct_error = h.is_field_error(field.errors) %}
   <div class="form-group{{ ' error' if direct_error else '' }}">
     <label for="{{ field.id }}" class="col-md-2 control-label">{{ field.label.text }}
@@ -99,6 +99,9 @@
       {% endfor %}
       </ul>
     {% endif %}
+    {% if caller %}
+      {{ caller(form, field, direct_error, kwargs) }}
+    {% endif %}
   </div>
 {% endmacro %}