Admin: improve non overloading imports

* improve non overloading import management in OSM
* add a warning message to "modified" items form

1 files changed, 22 insertions, 0 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index 1622923..20c0f29 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -389,6 +389,28 @@ class RapprochementTest(TestCase):
         for k in new_vals:
             self.assertEqual(getattr(ref_marker, k), new_vals[k])
 
+    def test_managed_modified_imported_markers(self):
+        ref_marker = self.markers[0]
+        new_vals = {'name':"Marker 1 - modified",
+                    'point':GEOSGeometry('SRID=4326;POINT(-4 48)')}
+        values = {'status':'I', 'ref_item':ref_marker, 'import_version':42}
+        values.update(new_vals)
+        modified_marker = Marker.objects.create(**values)
+        self.assertNotEqual(ref_marker.import_version,
+                            modified_marker.import_version)
+        modified_marker.categories.add(ref_marker.categories.all()[0])
+        response = self.client.post('/admin/chimere/marker/',
+                       data={'action':['managed_modified'],
+                             'index':0, 'rapprochement':1,
+                             'name':1, 'point':1,
+                             '_selected_action':[unicode(ref_marker.pk)]
+                            })
+        ref_marker = Marker.objects.get(pk=ref_marker.pk)
+        self.assertEqual(Marker.objects.filter(ref_item=ref_marker,
+                                               status='I').count(), 0)
+        for k in new_vals.keys() + ['import_version']:
+            self.assertEqual(getattr(ref_marker, k), values[k])
+
     def test_managed_modified_routes(self):
         ref_route = self.routes[0]
         new_vals = {'name':"Route 1 - modified",