From db61497b813d801a5a75594dc84442044998cb3c Mon Sep 17 00:00:00 2001
From: Matthias Bernt <m.bernt@ufz.de>
Date: Thu, 19 Dec 2024 14:17:10 +0100
Subject: [PATCH] fixes it tests

---
 tools/omero/omero_metadata_import.xml | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/tools/omero/omero_metadata_import.xml b/tools/omero/omero_metadata_import.xml
index a7865c0..11b39d9 100644
--- a/tools/omero/omero_metadata_import.xml
+++ b/tools/omero/omero_metadata_import.xml
@@ -35,14 +35,14 @@
             <option value="image">Image</option>
         </param>
         <conditional name="object_id">
-        <param name="object_id_selection" type="select" label="Selection" help="Create a new OMERO object or target an existing one">
-            <option value="new_object">Create new object</option>
-            <option value="existing_object">Target an existing object</option>
-        </param>
-        <when value="new_object"/>
-        <when value="existing_object">
-            <param name="did" type="integer" min = "1" optional="false" label="Object ID"/>
-        </when>
+            <param name="object_id_selection" type="select" label="Selection" help="Create a new OMERO object or target an existing one">
+                <option value="new_object">Create new object</option>
+                <option value="existing_object">Target an existing object</option>
+            </param>
+            <when value="new_object"/>
+            <when value="existing_object">
+                <param name="did" type="integer" min = "1" optional="false" label="Object ID"/>
+            </when>
         </conditional>
         <param argument="ann_type" type="select" optional="false" label="Annotation type" help="Select annotation format">
             <option value="table">Table</option>
@@ -60,7 +60,9 @@
             <param name="omero_port" value="6064"/>
             <param name="obj_type" value="project"/>
             <param name="ann_type" value="table"/>
-            <param name="object_id_selection" value="new_object"/>
+            <conditional name="object_id">
+                <param name="object_id_selection" value="new_object"/>
+            </conditional>
             <param name="ann_file" value="metadata.tsv"/>
             <param name="an_name" value="Table_Test"/>
             <param name="test_username" value="root"/>
@@ -76,7 +78,9 @@
             <param name="omero_port" value="6064"/>
             <param name="obj_type" value="dataset"/>
             <param name="ann_type" value="KV"/>
-            <param name="object_id_selection" value="new_object"/>
+            <conditional name="object_id">
+                <param name="object_id_selection" value="new_object"/>
+            </conditional>
             <param name="ann_file" value="metadata.tsv"/>
             <param name="an_name" value="KV_Test"/>
             <param name="test_username" value="root"/>
@@ -92,8 +96,10 @@
             <param name="omero_port" value="6064"/>
             <param name="obj_type" value="dataset"/>
             <param name="ann_type" value="KV"/>
-            <param name="object_id_selection" value="existing_object"/>
-            <param name="did" value="1"/>
+            <conditional name="object_id">
+                <param name="object_id_selection" value="existing_object"/>
+                <param name="did" value="1"/>
+            </conditional>
             <param name="ann_file" value="metadata.tsv"/>
             <param name="an_name" value="Additional_KV_Values"/>
             <param name="test_username" value="root"/>