# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1266580415 -3600
# Node ID cf3b35545602a0c4003a1cff3f1f9286b7f3b8a0
# Parent  6d7589b4ae6f9fa8782b8f49a4292e9a88f55e42# Parent  606364845c34058fe57e236e8c049e2f116d960f
merge

diff -r 6d7589b4ae6f -r cf3b35545602 web/views/autoform.py
--- a/web/views/autoform.py	Fri Feb 19 10:12:33 2010 +0100
+++ b/web/views/autoform.py	Fri Feb 19 12:53:35 2010 +0100
@@ -568,18 +568,18 @@
                 except f.FieldNotFound:
                     # meta attribute such as <attr>_format
                     continue
+        if self.fieldsets_in_order:
+            fsio = list(self.fieldsets_in_order)
+        else:
+            fsio = [None]
+        self.fieldsets_in_order = fsio
+        # add fields for relation whose target should have an inline form
+        for formview in self.inlined_form_views():
+            field = self._inlined_form_view_field(formview)
+            self.fields.append(field)
+            if not field.fieldset in fsio:
+                fsio.append(field.fieldset)
         if self.formtype == 'main':
-            if self.fieldsets_in_order:
-                fsio = list(self.fieldsets_in_order)
-            else:
-                fsio = [None]
-            self.fieldsets_in_order = fsio
-            # add fields for relation whose target should have an inline form
-            for formview in self.inlined_form_views():
-                field = self._inlined_form_view_field(formview)
-                self.fields.append(field)
-                if not field.fieldset in fsio:
-                    fsio.append(field.fieldset)
             # add the generic relation field if necessary
             if entity.has_eid() and (
                 self.display_fields is None or