summaryrefslogtreecommitdiff
path: root/chimere/admin.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/admin.py')
-rw-r--r--chimere/admin.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 1fe5ce0..8cdb349 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -126,9 +126,6 @@ def managed_modified(modeladmin, request, queryset):
item_ref = item.ref_item
if request.POST.get('rapprochement'):
couple = [(item, item_ref)]
- if hasattr(item, 'associated_marker'):
- couple.append((item.associated_marker.all()[0],
- item_ref.associated_marker.all()[0]))
updated = dict(request.POST)
# clean
for k in ('action', 'rapprochement', 'index', '_selected_action'):
@@ -162,9 +159,6 @@ def managed_modified(modeladmin, request, queryset):
it_ref.setProperty(pm, it.getProperty(pm))
except (ValueError, ObjectDoesNotExist):
pass
- if hasattr(item, 'associated_marker'):
- for it in item.associated_marker.all():
- it.delete()
item.delete()
messages.success(request, _(u"Modified item traited."))
return HttpResponseRedirect(redirect_url)
@@ -315,8 +309,7 @@ ROUTE_FIELDSETS = deepcopy(MARKER_FIELDSETS)
ROUTE_FIELDSETS[0][1]['fields'][0] = 'route'
ROUTE_FIELDSETS[0][1]['fields'].pop(ROUTE_FIELDSETS[0][1]['fields'].index(
'description'))
-ROUTE_FIELDSETS[3][1]['fields'] = ('ref_item', 'associated_file',
- 'has_associated_marker')
+ROUTE_FIELDSETS[3][1]['fields'] = ('ref_item', 'associated_file',)
POLYGON_FIELDSETS = deepcopy(MARKER_FIELDSETS)
POLYGON_FIELDSETS[0][1]['fields'][0] = 'polygon'
POLYGON_FIELDSETS[0][1]['fields'].pop(POLYGON_FIELDSETS[0][1]['fields'].index(
@@ -410,7 +403,7 @@ class RouteAdmin(MarkerAdmin):
list_filter = ('status', AreaRouteListFilter, 'categories')
exclude = ['height', 'width']
form = RouteAdminForm
- readonly_fields = ('associated_file', 'ref_item', 'has_associated_marker')
+ readonly_fields = ('associated_file', 'ref_item')
actions = [validate, disable, managed_modified, export_to_kml,
export_to_shapefile, export_to_csv]
fieldsets = ROUTE_FIELDSETS