Merge branch 'liuzx_trainjob' of https://git.openi.org.cn/OpenI/aiforge into liuzx_trainjob

routers/repo/modelarts.go

@@ -479,6 +479,7 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 	ctx.Data["PageIsCloudBrain"] = true
 	var jobID = ctx.Params(":jobid")
 	var versionName = ctx.Query("version_name")
+
 	// canNewJob, err := canUserCreateTrainJobVersion(ctx, jobID, versionName)
 	// if err != nil {
 	// 	ctx.ServerError("canNewJob can info failed", err)
@@ -491,6 +492,13 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", jobID, err.Error())
 		return err
 	}
+	//判断权限
+	canNewJob, err := canUserCreateTrainJobVersion(ctx, task.UserID)
+	if !canNewJob {
+		ctx.ServerError("user cann't new trainjob", err)
+		return err
+	}
+	ctx.Data["canNewJob"] = canNewJob
 
 	t := time.Now()
 	var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
@@ -643,6 +651,7 @@ func VersionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrai
 	ctx.Data["engine_name"] = form.EngineName
 	ctx.Data["flavor_code"] = task.FlavorCode
 	ctx.Data["engine_id"] = task.EngineID
+	ctx.Data["version_name"] = form.VersionName
 
 	ctx.Data["bootFile"] = form.BootFile
 	ctx.Data["uuid"] = form.Attachment
@@ -1183,7 +1192,7 @@ func TrainJobShow(ctx *context.Context) {
 		if len(parameters.Parameter) > 0 {
 			paramTemp := ""
 			for _, Parameter := range parameters.Parameter {
-				param := Parameter.Label + " = " + Parameter.Value + ", "
+				param := Parameter.Label + " = " + Parameter.Value + "; "
 				paramTemp = paramTemp + param
 			}
 			VersionListTasks[i].Parameters = paramTemp[:len(paramTemp)-2]
@@ -1328,7 +1337,6 @@ func canUserCreateTrainJobVersion(ctx *context.Context, userID int64) (bool, err
 		return true, nil
 	} else {
 		log.Error("Only user itself and admin can new trainjob!")
-		// ctx.ServerError("Only user itself and admin can new trainjob!", nil)
 		return false, nil
 	}
 }