Merge pull request Soaa-#13 from smcoll/master

Layout fixes
PetrDlouhy · Oct 20, 2014 · 1d838af · 1d838af
2 parents 7300bab + 4915d37
commit 1d838af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/nested_inline/admin.py b/nested_inline/admin.py
@@ -203,7 +203,7 @@ def add_view(self, request, form_url='', extra_context=None):
                 formset = FormSet(instance=self.model(), prefix=prefix,
                     queryset=inline.queryset(request))
                 formsets.append(formset)
-                if hasattr(inline, 'inlines'):
+                if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
         adminForm = helpers.AdminForm(form, list(self.get_fieldsets(request)),
@@ -221,7 +221,7 @@ def add_view(self, request, form_url='', extra_context=None):
                 fieldsets, prepopulated, readonly, model_admin=self)
             inline_admin_formsets.append(inline_admin_formset)
             media = media + inline_admin_formset.media
-            if hasattr(inline, 'inlines'):
+            if hasattr(inline, 'inlines') and inline.inlines:
                 media += self.wrap_nested_inline_formsets(request, inline, formset)
 
         context = {
@@ -278,7 +278,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                     instance=new_object, prefix=prefix,
                     queryset=inline.queryset(request))
                 formsets.append(formset)
-                if hasattr(inline, 'inlines'):
+                if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
             if self.all_valid_with_nesting(formsets) and form_validated:
@@ -299,7 +299,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                 formset = FormSet(instance=obj, prefix=prefix,
                     queryset=inline.queryset(request))
                 formsets.append(formset)
-                if hasattr(inline, 'inlines'):
+                if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
         adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj),
@@ -317,7 +317,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                 fieldsets, prepopulated, readonly, model_admin=self)
             inline_admin_formsets.append(inline_admin_formset)
             media = media + inline_admin_formset.media
-            if hasattr(inline, 'inlines'):
+            if hasattr(inline, 'inlines') and inline.inlines:
                 media += self.wrap_nested_inline_formsets(request, inline, formset)
 
         context = {

diff --git a/nested_inline/static/admin/css/forms-nested.css b/nested_inline/static/admin/css/forms-nested.css
@@ -354,7 +354,7 @@ body.popup .submit-row {
 }
 
 .nested-inline {
-	margin: 10px;
+	margin: 5px;
 }
 
 td > .nested-inline {

diff --git a/nested_inline/templates/admin/edit_inline/tabular-nested.html b/nested_inline/templates/admin/edit_inline/tabular-nested.html
@@ -1,6 +1,6 @@
 {% load i18n admin_static admin_modify %}
-{% with recursive_formset=inline_admin_formset stacked_template='admin/edit_inline/stacked-nested.html' tabular_template='admin/edit_inline/tabular-nested.html'%}
 <div class="inline-group{% if recursive_formset %} {{ recursive_formset.formset.prefix|default:"Root" }}-nested-inline{% if prev_prefix %} {{ prev_prefix }}-{{ loopCounter }}-nested-inline{% endif %} nested-inline{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-group">
+{% with recursive_formset=inline_admin_formset stacked_template='admin/edit_inline/stacked-nested.html' tabular_template='admin/edit_inline/tabular-nested.html'%}
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}" id="{{ recursive_formset.formset.prefix }}">
 {{ recursive_formset.formset.management_form }}
 <fieldset class="module">