Merge branch 'import-cached-object' into 'master'

Fix cached object in DataImportDetails view

See merge request !1290

arkindex/dataimport/api.py

@@ -227,9 +227,9 @@ class DataImportDetails(ProcessACLMixin, RetrieveUpdateDestroyAPIView):
             .annotate(last_run=Max('workflow__tasks__run'))
 
     def get_object(self):
-        if not hasattr(self, 'dataimport'):
-            self.element = super().get_object()
-        return self.element
+        if not hasattr(self, '_dataimport'):
+            self._dataimport = super().get_object()
+        return self._dataimport
 
     def get_serializer_context(self):
         context = super().get_serializer_context()

arkindex/dataimport/tests/test_imports.py

@@ -374,7 +374,7 @@ class TestImports(FixtureAPITestCase):
         self.user_img_process.start()
         self.user_img_process.workflow.tasks.all().delete()
         self.client.force_login(self.user)
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(8):
             response = self.client.get(reverse('api:import-details', kwargs={'pk': self.user_img_process.id}))
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         data = response.json()
@@ -382,7 +382,7 @@ class TestImports(FixtureAPITestCase):
 
     def test_details(self):
         self.client.force_login(self.user)
-        with self.assertNumQueries(9):
+        with self.assertNumQueries(7):
             response = self.client.get(reverse('api:import-details', kwargs={'pk': self.user_img_process.id}))
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         data = response.json()
@@ -462,7 +462,7 @@ class TestImports(FixtureAPITestCase):
         self.client.force_login(self.user)
         self.elts_process.start()
         self.elts_process.workflow.tasks.update(state=State.Running)
-        with self.assertNumQueries(10):
+        with self.assertNumQueries(7):
             response = self.client.patch(reverse('api:import-details', kwargs={'pk': self.elts_process.id}))
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertDictEqual(response.json(), {'__all__': ['Cannot edit a workflow while it is running']})
@@ -475,7 +475,7 @@ class TestImports(FixtureAPITestCase):
         self.elts_process.start()
         self.elts_process.workflow.tasks.update(state=State.Running)
         self.assertEqual(self.elts_process.name, None)
-        with self.assertNumQueries(12):
+        with self.assertNumQueries(9):
             response = self.client.patch(
                 reverse('api:import-details', kwargs={'pk': self.elts_process.id}),
                 {'name': 'newName'},
@@ -568,7 +568,7 @@ class TestImports(FixtureAPITestCase):
             (dataimport.name, dataimport.name_contains, dataimport.element_type, dataimport.load_children),
             (None, None, None, False)
         )
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(9):
             response = self.client.patch(
                 reverse('api:import-details', kwargs={'pk': dataimport.id}),
                 {