Fix fields bound to empty managers being ignored and stop automatical…

…ly calling callable attributes
nyaruka · Jun 6, 2017 · 06e571b · 06e571b
1 parent 357dad5
commit 06e571b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/smartmin/templates/smartmin/field.html b/smartmin/templates/smartmin/field.html
@@ -6,7 +6,7 @@
 {% if form_field and form_field.is_hidden %}
 {{ form_field }}
 {% else %}
-{% if form_field %}
+{% if form_field != None %}
 <div class="form-group {% if form_field.errors %}error{% endif %}">
   <label class="col-sm-2 control-label" for="{{ field.name }}">{% get_label field %}</label>
   <div class="col-sm-10 smartmin-form-field">

diff --git a/smartmin/views.py b/smartmin/views.py
@@ -141,10 +141,6 @@ def lookup_obj_attribute(self, obj, field):
         # next up is the object itself
         obj_field = getattr(obj, curr_field, None)
 
-        # if it is callable, do so
-        if obj_field and getattr(obj_field, '__call__', None):
-            obj_field = obj_field()
-
         if obj_field and rest:
             return self.lookup_obj_attribute(obj_field, rest)
         else: