Commits

Igor Tokarev committed cca955c

eav formset in admin interface

Comments (0)

Files changed (1)

 )
 from django.forms.models import BaseInlineFormSet
 from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
 
 
 class BaseEntityAdmin(ModelAdmin):
         """
         form = context['adminform'].form
 
+        all_fields = form.fields.keys()
+        model_fields = form.base_fields.keys()
+        eav_fields = filter(lambda x: x not in model_fields, all_fields)
+        
         if self.eav_fieldsets:
-          fieldsets = self.eav_fieldsets
+            fieldsets_eav = self.eav_fieldsets + ((_('Attributes'), {'classes': ('collapse',), 'fields': tuple(eav_fields)}),)
+            fieldsets = fieldsets_eav
         # or infer correct data from the form
         else:
-          fieldsets = [(None, {'fields': form.fields.keys()})]
+          fieldsets = [(None, {'fields': all_fields})]
 
         adminform = helpers.AdminForm(form, fieldsets,
                                       self.prepopulated_fields)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.