From 5c12c7713d3b9e237fc4488035b972e618bdd782 Mon Sep 17 00:00:00 2001
From: wang yan <wangyan@vmware.com>
Date: Wed, 8 May 2019 15:22:20 +0800
Subject: [PATCH] Return 200 when to post an none schedule

1, Throw the error of job service to UI when to create job schedule.
2, Return 200 when to save none without schedule.

Fixed #7675

Signed-off-by: wang yan <wangyan@vmware.com>
---
 src/core/api/admin_job.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/api/admin_job.go b/src/core/api/admin_job.go
index 112b3b3c6..14bdbcae6 100644
--- a/src/core/api/admin_job.go
+++ b/src/core/api/admin_job.go
@@ -219,6 +219,11 @@ func (aj *AJAPI) getLog(id int64) {
 
 // submit submits a job to job service per request
 func (aj *AJAPI) submit(ajr *models.AdminJobReq) {
+	// when the schedule is saved as None without any schedule, just return 200 and do nothing.
+	if ajr.Schedule.Type == models.ScheduleNone {
+		return
+	}
+
 	// cannot post multiple schedule for admin job.
 	if ajr.IsPeriodic() {
 		jobs, err := dao.GetAdminJobs(&common_models.AdminJobQuery{
@@ -254,11 +259,7 @@ func (aj *AJAPI) submit(ajr *models.AdminJobReq) {
 		if err := dao.DeleteAdminJob(id); err != nil {
 			log.Debugf("Failed to delete admin job, err: %v", err)
 		}
-		if httpErr, ok := err.(*common_http.Error); ok && httpErr.Code == http.StatusConflict {
-			aj.SendConflictError(fmt.Errorf("conflict when triggering %s, please try again later", ajr.Name))
-			return
-		}
-		aj.SendInternalServerError(err)
+		aj.ParseAndHandleError("failed to submit admin job", err)
 		return
 	}
 	if err := dao.SetAdminJobUUID(id, uuid); err != nil {