fix missing redirects, fix multiple results

NINAnor · Jun 21, 2024 · 8436f4d · 8436f4d
1 parent b573c9b
commit 8436f4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/genlab_bestilling/forms.py b/src/genlab_bestilling/forms.py
@@ -136,7 +136,7 @@ def __init__(self, *args, project, **kwargs):
         self.fields["sample_types"].queryset = project.sample_types.all()
         self.fields["markers"].queryset = Marker.objects.filter(
             species__projects__id=project.id
-        )
+        ).distinct()
 
     def save(self, commit=True):
         obj = super().save(commit=False)
@@ -210,7 +210,7 @@ class Meta:
             ),
             "location": Selectize(search_lookup="name_icontains"),
             "type": Selectize(search_lookup="name_icontains"),
-            "markers": Selectize(search_lookup="name_icontains"),
+            "markers": DualSortableSelector(search_lookup="name_icontains"),
             "date": DateInput(),
             "notes": forms.widgets.Textarea(attrs={"rows": 1, "cols": 10}),
         }

diff --git a/src/genlab_bestilling/views.py b/src/genlab_bestilling/views.py
@@ -87,11 +87,23 @@ class ProjectUpdateView(FormsetUpdateView):
     model = Project
     form_class = ProjectForm
 
+    def get_success_url(self):
+        return reverse(
+            "project-detail",
+            kwargs={"pk": self.object.id},
+        )
+
 
 class ProjectCreateView(FormsetCreateView):
     model = Project
     form_class = ProjectForm
 
+    def get_success_url(self):
+        return reverse(
+            "project-detail",
+            kwargs={"pk": self.object.id},
+        )
+
 
 class ProjectNestedMixin(LoginRequiredMixin):
     """
@@ -173,7 +185,7 @@ def get_queryset(self) -> QuerySet[Any]:
 
     def get_success_url(self):
         return reverse(
-            "project-order-detail",
+            "project-equipment-detail",
             kwargs={"project_id": self.project.id, "pk": self.object.id},
         )
 
@@ -187,7 +199,7 @@ class EquipmentOrderCreateView(
 
     def get_success_url(self):
         return reverse(
-            "project-order-detail",
+            "project-equipment-detail",
             kwargs={"project_id": self.project.id, "pk": self.object.id},
         )