Skip to content

Commit c3b72ea

Browse files
committed
Prevent trying to create workflow again if only one in a packed file
1 parent 80462d0 commit c3b72ea

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/org/commonwl/view/workflow/WorkflowController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ public ModelAndView createWorkflow(@Valid WorkflowForm workflowForm, BindingResu
126126
if (result.getWorkflowList() == null) {
127127
workflow = result.getTempRepresentation();
128128
} else {
129+
if (result.getWorkflowList().size() == 1) {
130+
gitInfo.setPackedId(result.getWorkflowList().get(0).getFileName());
131+
}
129132
return new ModelAndView("redirect:" + gitInfo.getInternalUrl());
130133
}
131134
} else {

src/main/java/org/commonwl/view/workflow/WorkflowService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,6 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
314314
List<WorkflowOverview> overviews = cwlService.getWorkflowOverviewsFromPacked(workflowFile);
315315
if (overviews.size() == 0) {
316316
throw new IOException("No workflow was found within the packed CWL file");
317-
} else if (overviews.size() == 1) {
318-
packedWorkflowId = overviews.get(0).getFileName();
319317
} else {
320318
// Dummy queued workflow object to return the list
321319
QueuedWorkflow overviewList = new QueuedWorkflow();
@@ -328,7 +326,6 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
328326

329327
// Set origin details
330328
basicModel.setRetrievedOn(new Date());
331-
gitInfo.setPackedId(packedWorkflowId);
332329
basicModel.setRetrievedFrom(gitInfo);
333330
basicModel.setLastCommit(latestCommit);
334331

0 commit comments

Comments
 (0)