fix(fe): error message for invalid cron format

semaphoreui · Sep 6, 2021 · c236737 · c236737
1 parent 813eae8
commit c236737
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/api/projects/schedules.go b/api/projects/schedules.go
@@ -74,7 +74,7 @@ func AddSchedule(w http.ResponseWriter, r *http.Request) {
 	err := schedules.ValidateCronFormat(schedule.CronFormat)
 	if err != nil {
 		helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
-			"error": err.Error(),
+			"error": "Cron: " + err.Error(),
 		})
 		return
 	}
@@ -133,7 +133,7 @@ func UpdateSchedule(w http.ResponseWriter, r *http.Request) {
 	err := schedules.ValidateCronFormat(schedule.CronFormat)
 	if err != nil {
 		helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
-			"error": err.Error(),
+			"error": "Cron: " + err.Error(),
 		})
 		return
 	}

diff --git a/api/schedules/pool.go b/api/schedules/pool.go
@@ -14,7 +14,10 @@ type ScheduleRunner struct {
 }
 
 func (r ScheduleRunner) Run() {
-	_, err := tasks.AddTaskToPool(r.Store, db.Task{}, nil, r.Schedule.ProjectID)
+	_, err := tasks.AddTaskToPool(r.Store, db.Task{
+		TemplateID: r.Schedule.TemplateID,
+		ProjectID: r.Schedule.ProjectID,
+	}, nil, r.Schedule.ProjectID)
 	if err != nil {
 		log.Error(err)
 	}

diff --git a/web2/src/components/TemplateForm.vue b/web2/src/components/TemplateForm.vue
@@ -5,6 +5,12 @@
       v-model="formValid"
       v-if="isLoaded"
   >
+    <v-alert
+        :value="formError"
+        color="error"
+        class="pb-2"
+    >{{ formError }}</v-alert>
+
     <v-row>
       <v-col cols="12" md="6" class="pb-0">
         <v-text-field

diff --git a/web2/src/views/project/Templates.vue b/web2/src/views/project/Templates.vue
@@ -7,7 +7,7 @@
   </div>
   <div v-else>
     <EditDialog
-      max-width="700"
+      :max-width="700"
       v-model="editDialog"
       save-button-text="Create"
       title="New template"