Merge pull request #863 from betagouv/fix/change-run-missing-label

bugfix: members cannot edit run (missing label)
betagouv · Mar 29, 2024 · bdffebb · bdffebb
2 parents 603bcd4 + a445a8a
commit bdffebb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/lab/forms.py b/lab/forms.py
@@ -226,7 +226,6 @@ def _clean_methods(self, cleaned_data, errors):
 class RunDetailsForm(BaseRunDetailsForm):
     class Meta(BaseRunDetailsForm.Meta):
         fields = (
-            "label",
             "beamline",
             *[f.name for f in models.Run.get_method_fields()],
             *[f.name for f in models.Run.get_detector_fields()],

diff --git a/lab/static/css/admin/run.css b/lab/static/css/admin/run.css
@@ -81,6 +81,10 @@ body {
   padding: 0;
 }
 
+.change-form .field-energy_in_keV input {
+  margin-top: .5rem !important;
+}
+
 .form-row {
   max-width: 500px;
 }

diff --git a/lab/tests/admin/test_run_admin.py b/lab/tests/admin/test_run_admin.py
@@ -220,6 +220,43 @@ def test_add_redirect_when_no_project_membership(self):
 
         assert response.status_code == 302
 
+    @patch("django.middleware.csrf.CsrfViewMiddleware._check_token", lambda *args: None)
+    def test_changing_run(self):
+        run = factories.RunFactory(label="Run 1", project=self.project)
+        data = {
+            "particle_type": "Proton",
+            "energy_in_keV_Proton": "1000",
+            "energy_in_keV_Alpha+particle": "",
+            "energy_in_keV_Deuton": "",
+            "beamline": "Microbeam",
+            "method_PIXE": "on",
+            "detector_LE0": "on",
+            "filters_for_detector_LE0": "Helium",
+            "filters_for_detector_HE1": "",
+            "filters_for_detector_HE2": "",
+            "filters_for_detector_HE3": "",
+            "filters_for_detector_HE4": "",
+            "detector_IBIL_other": "",
+            "detector_FORS_other": "",
+            "detector_ERDA": "",
+            "detector_NRA": "",
+        }
+
+        self.client.force_login(self.project_leader_user)
+        self.client.post(
+            reverse("admin:lab_run_change", args=[run.id]),
+            data=data,
+        )
+
+        run = Run.objects.get(pk=run.id)
+        assert run.particle_type == "Proton"
+        assert run.energy_in_keV == 1000
+        assert run.beamline == "Microbeam"
+        assert run.method_PIXE
+        assert run.detector_LE0
+        assert run.filters_for_detector_LE0 == "Helium"
+        assert not run.filters_for_detector_HE1
+
 
 class TestRunAdminViewAsAdmin(TestCase):
     def setUp(self):

diff --git a/lab/tests/test_controlled_datalist.py b/lab/tests/test_controlled_datalist.py
@@ -92,7 +92,7 @@ def test_form_fails_gracefully_with_incoherent_controller_input():
 def test_form_doesnt_raise_for_energy_when_other_errors():
     form = RunDetailsForm(
         data={
-            "beamline": "Microbeam",
+            "beamline": "WRONG",
             "energy_in_keV_Proton": 1,
             "energy_in_keV_Alpha particle": 2,
             "energy_in_keV_Deuton": "",
@@ -103,5 +103,5 @@ def test_form_doesnt_raise_for_energy_when_other_errors():
     )
     with patch.object(QuerySet, "exists", return_value=False):
         assert not form.is_valid()
-    assert form.has_error("label")
+    assert form.has_error("beamline")
     assert not form.has_error("energy_in_keV")