Update Template.go

semaphoreui · Jun 13, 2023 · d589598 · d589598
1 parent 763bd6e
commit d589598
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/db/Template.go b/db/Template.go
@@ -123,19 +123,19 @@ func FillTemplate(d Store, template *Template) (err error) {
 	if err != nil {
 		return
 	}
-
-	if template.SurveyVarsJSON != nil {
-		err = json.Unmarshal([]byte(*template.SurveyVarsJSON), &template.SurveyVars)
-	}
 
 	var tasks []TaskWithTpl
+	tasks, err = d.GetTemplateTasks(template.ProjectID, template.ID, RetrieveQueryParams{Count: 1})
 	if err != nil {
 		return
-	tasks, err = d.GetTemplateTasks(template.ProjectID, template.ID, RetrieveQueryParams{Count: 1})
 	}
 	if len(tasks) > 0 {
 		template.LastTask = &tasks[0]
 	}
 
+	if template.SurveyVarsJSON != nil {
+		err = json.Unmarshal([]byte(*template.SurveyVarsJSON), &template.SurveyVars)
+	}
+
 	return
 }