diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 19:19:17 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 19:19:17 +0200 |
| commit | c41d683140f9611b5faff4ad1e22affb580c0e13 (patch) | |
| tree | 11edc06b3b93172c52ad3ce661df1f48f8665c83 /chimere/admin.py | |
| parent | 0a93093f46b5f7986c2f91af8a79e4aeee5002b3 (diff) | |
| parent | 14d9b88851aadc287d87bfdc626092eb7a67bbe2 (diff) | |
| download | Chimère-c41d683140f9611b5faff4ad1e22affb580c0e13.tar.bz2 Chimère-c41d683140f9611b5faff4ad1e22affb580c0e13.zip | |
Merge branch 'v3.0'
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index a30f0df..acc9cfc 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -187,20 +187,22 @@ admin.site.unregister(User) admin.site.register(User, UserAdmin) -class PictureInline(admin.TabularInline): +class PictureMarkerInline(admin.TabularInline): model = PictureFile extra = 1 ordering = ('order',) form = PictureFileAdminForm readonly_fields = ('height', 'width') - exclude = ('thumbnailfile', 'thumbnailfile_height', 'thumbnailfile_width') + exclude = ('thumbnailfile', 'thumbnailfile_height', 'thumbnailfile_width', + 'polygon') -class MultimediaInline(admin.TabularInline): +class MultimediaMarkerInline(admin.TabularInline): model = MultimediaFile extra = 1 ordering = ('order',) form = MultimediaFileAdminForm + exclude = ('polygon', ) class AreaMarkerListFilter(admin.SimpleListFilter): @@ -339,7 +341,7 @@ class MarkerAdmin(admin.ModelAdmin): 'submiter_name', 'ref_item', 'modified_since_import', 'route'] form = MarkerAdminForm fieldsets = MARKER_FIELDSETS - inlines = [MultimediaInline, PictureInline] + inlines = [MultimediaMarkerInline, PictureMarkerInline] has_properties = True def get_fieldsets(self, request, obj=None): |