summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-16 18:01:57 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-16 18:01:57 +0200
commit08806031d443e5b6d9b0f0fcc70019cbc51a4f43 (patch)
treee05376cf0acf4c4da32e77b84440fa3ee3842c9c
parent4b43d6a39892036d656693a14a7ebdf7df402317 (diff)
downloadChimère-08806031d443e5b6d9b0f0fcc70019cbc51a4f43.tar.bz2
Chimère-08806031d443e5b6d9b0f0fcc70019cbc51a4f43.zip
Fix marker admin: don't display associated route
-rw-r--r--chimere/admin.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 8cdb349..cdcd053 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -133,11 +133,6 @@ def managed_modified(modeladmin, request, queryset):
updated.pop(k)
for idx, cpl in enumerate(couple):
it, it_ref = cpl
- # don't copy geometry of associated items
- if idx:
- for k in ('route', 'point'):
- if k in updated:
- updated.pop(k)
updated_keys = updated.keys()
if it.status == 'I':
updated_keys.append('import_version')
@@ -188,7 +183,7 @@ class PictureMarkerInline(admin.TabularInline):
form = PictureFileAdminForm
readonly_fields = ('height', 'width')
exclude = ('thumbnailfile', 'thumbnailfile_height', 'thumbnailfile_width',
- 'polygon')
+ 'polygon', 'route')
class MultimediaMarkerInline(admin.TabularInline):
@@ -196,7 +191,7 @@ class MultimediaMarkerInline(admin.TabularInline):
extra = 1
ordering = ('order',)
form = MultimediaFileAdminForm
- exclude = ('polygon', )
+ exclude = ('polygon', 'route')
class AreaMarkerListFilter(admin.SimpleListFilter):
@@ -301,7 +296,7 @@ MARKER_FIELDSETS = [
}],
[_(u"Associated items"), {
'classes': ('collapse',),
- 'fields': ['ref_item', 'route']
+ 'fields': ['ref_item', ]
}]
]
@@ -331,7 +326,7 @@ class MarkerAdmin(admin.ModelAdmin):
'available_date', 'ref_item']
readonly_fields = [
'submiter_email', 'submiter_comment', 'import_source',
- 'submiter_name', 'ref_item', 'modified_since_import', 'route']
+ 'submiter_name', 'ref_item', 'modified_since_import', ]
form = MarkerAdminForm
fieldsets = MARKER_FIELDSETS
inlines = [MultimediaMarkerInline, PictureMarkerInline]