Fix #6525: WIP

radiasoft · Dec 20, 2023 · 4450c61 · 4450c61
1 parent 0390d3a
commit 4450c61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/sirepo/exporter.py b/sirepo/exporter.py
@@ -64,7 +64,6 @@ def _create_zip(sim, out_dir, qcall):
                     d = simulation_db.open_json_file(
                         sim_obj.simulationType, sid=sim_obj.simulationId, qcall=qcall
                     )
-                    # TODO (gurhar1133): something better than "related_sim" prefix?
                     z.writestr(
                         f"related_sim{idx}.json",
                         pkjson.dump_pretty(d, pretty=True),

diff --git a/sirepo/importer.py b/sirepo/importer.py
@@ -113,7 +113,7 @@ def read_zip(zip_bytes, qcall, sim_type=None):
 
 
 def _import_related_sims(data, zip_bytes, tmp_dir, qcall=None):
-    from sirepo import simulation_db, sim_data
+    from sirepo import simulation_db
 
     with zipfile.ZipFile(six.BytesIO(zip_bytes), "r") as zip_obj:
         for i in zip_obj.infolist():
@@ -122,8 +122,7 @@ def _import_related_sims(data, zip_bytes, tmp_dir, qcall=None):
             if "related_sim" in b:
                 d = simulation_db.json_load(zip_obj.read(i))
                 d.models.simulation.isExample = False
-                # TODO: folder needs to be /Omega
-                d.models.simulation.folder = f"/{d.simulationType.title()}"
+                d.models.simulation.folder = f"/{data.simulationType.title()}"
                 s = simulation_db.save_new_simulation(
                     d,
                     qcall=qcall,