Merge pull request #466 from sbesson/annotation_files_validation

Avoid the creation of empty file annotations
ome · May 4, 2023 · d53e790 · d53e790
2 parents a6f8962 + 3bda370
commit d53e790
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/omeroweb/webclient/views.py b/omeroweb/webclient/views.py
@@ -2399,7 +2399,9 @@ def annotate_file(request, conn=None, **kwargs):
 
     if request.method == "POST":
         # handle form submission
-        form_file = FilesAnnotationForm(initial=initial, data=request.POST.copy())
+        form_file = FilesAnnotationForm(
+            initial=initial, data=request.POST.copy(), files=request.FILES
+        )
         if form_file.is_valid():
             # Link existing files...
             files = form_file.cleaned_data["files"]

diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def read(fname):
         "omero-py>=5.7.0",
         # minimum requirements for `omero web start`
         "concurrent-log-handler>=0.9.20",
-        "Django>=3.2.18,<4.0",
+        "Django==3.2.18,<4.0",
         "django-pipeline==2.0.7",
         "django-cors-headers==3.7.0",
         "whitenoise>=5.3.0",