add task InventoryID is null use Template.InventoryID

warlocgao · warlocgao · commit 73e83944b312 · 2024-08-20T10:23:09.000+08:00
diff --git a/services/tasks/TaskRunner.go b/services/tasks/TaskRunner.go
@@ -249,7 +249,7 @@ func (t *TaskRunner) populateDetails() error {
 	}
 
 	// get inventory
-	if t.Task.InventoryID!=nil{
+	if t.Task.InventoryID != nil {
 		t.Inventory, err = t.pool.store.GetInventory(t.Template.ProjectID, *t.Task.InventoryID)
 		if err != nil {
 			if t.Template.InventoryID != nil {
@@ -259,6 +259,13 @@ func (t *TaskRunner) populateDetails() error {
 				}
 			}
 		}
+	} else {
+		if t.Template.InventoryID != nil {
+			t.Inventory, err = t.pool.store.GetInventory(t.Template.ProjectID, *t.Template.InventoryID)
+			if err != nil {
+				return t.prepareError(err, "Template Inventory not found!")
+			}
+		}
 	}
 
 	// get repository

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func (t *TaskRunner) populateDetails() error {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`// get inventory`
`252`		`- if t.Task.InventoryID!=nil{`
	`252`	`+ if t.Task.InventoryID != nil {`
`253`	`253`	`t.Inventory, err = t.pool.store.GetInventory(t.Template.ProjectID, *t.Task.InventoryID)`
`254`	`254`	`if err != nil {`
`255`	`255`	`if t.Template.InventoryID != nil {`
`@@ -259,6 +259,13 @@ func (t *TaskRunner) populateDetails() error {`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`	`}`
	`262`	`+ } else {`
	`263`	`+ if t.Template.InventoryID != nil {`
	`264`	`+ t.Inventory, err = t.pool.store.GetInventory(t.Template.ProjectID, *t.Template.InventoryID)`
	`265`	`+ if err != nil {`
	`266`	`+ return t.prepareError(err, "Template Inventory not found!")`
	`267`	`+ }`
	`268`	`+ }`
`262`	`269`	`}`
`263`	`270`
`264`	`271`	`// get repository`