Merge branch 'v2.9'

1 files changed, 3 insertions, 11 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 1ccd482..f9a9bf9 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -294,9 +294,6 @@ def get_edit_page(redirect_url, item_cls, item_form,
                     item.ref_item = ref_item
                     if item.pk != ref_item.pk:
                         item.status = 'M'
-                        if hasattr(ref_item, 'has_associated_marker'):
-                            item.has_associated_marker = \
-                                ref_item.has_associated_marker
                 elif not item.ref_item:
                     # initialisation
                     item.ref_item = item
@@ -306,18 +303,13 @@ def get_edit_page(redirect_url, item_cls, item_form,
                     item.status = 'S'
                 item.save()
 
-                marker = item
-                if not isinstance(marker, Marker) \
-                   and hasattr(item, 'associated_marker') \
-                   and item.associated_marker.count():
-                    marker = item.associated_marker.all()[0]
-                if marker:
+                if item:
                     # manage multimedia items
                     for f in formset_multi:
-                        f.save(marker)
+                        f.save(item)
 
                     for f in formset_picture:
-                        f.save(marker)
+                        f.save(item)
                 base_uri = get_base_uri(request)
                 notifySubmission(base_uri, item)
                 response_dct = get_base_response(request, area_name)