diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0a6936851..edd5f102a 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -3,6 +3,7 @@ package models import ( "encoding/json" "fmt" + "strings" "time" "xorm.io/xorm" @@ -176,6 +177,10 @@ func ConvertToTaskPod(input map[string]interface{}) (TaskPod, error) { err := json.Unmarshal(data, &taskPod) taskPod.TaskStatuses[0].StartTime = time.Unix(taskPod.TaskStatuses[0].StartAt.Unix()+8*3600, 0).UTC().Format("2006-01-02 15:04:05") taskPod.TaskStatuses[0].FinishedTime = time.Unix(taskPod.TaskStatuses[0].FinishedAt.Unix()+8*3600, 0).UTC().Format("2006-01-02 15:04:05") + //if the task is not finished or stopped,the cloudbrain renturns 0001-01-01 08:00:00, the finishedTime shows with - + if strings.HasPrefix(taskPod.TaskStatuses[0].FinishedTime, "0001") { + taskPod.TaskStatuses[0].FinishedTime = "-" + } return taskPod, err } diff --git a/modules/repository/create.go b/modules/repository/create.go index 5c0aae30d..d740c58b1 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -47,7 +47,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m // No need for init mirror. if !opts.IsMirror { repoPath := models.RepoPath(u.Name, repo.Name) - if err = initRepository(ctx, repoPath, u, repo, opts); err != nil { + if err = initRepository(ctx, repoPath, doer, u, repo, opts); err != nil { if err2 := os.RemoveAll(repoPath); err2 != nil { log.Error("initRepository: %v", err) return fmt.Errorf( diff --git a/modules/repository/init.go b/modules/repository/init.go index f468ca043..3d1c663c8 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -176,7 +176,7 @@ func checkInitRepository(repoPath string) (err error) { } // InitRepository initializes README and .gitignore if needed. -func initRepository(ctx models.DBContext, repoPath string, u *models.User, repo *models.Repository, opts models.CreateRepoOptions) (err error) { +func initRepository(ctx models.DBContext, repoPath string, doer *models.User, u *models.User, repo *models.Repository, opts models.CreateRepoOptions) (err error) { if err = checkInitRepository(repoPath); err != nil { return err } @@ -195,8 +195,14 @@ func initRepository(ctx models.DBContext, repoPath string, u *models.User, repo } // Apply changes and commit. - if err = initRepoCommit(tmpDir, repo, u, opts.DefaultBranch); err != nil { - return fmt.Errorf("initRepoCommit: %v", err) + if u.IsOrganization() { + if err = initRepoCommit(tmpDir, repo, doer, opts.DefaultBranch); err != nil { + return fmt.Errorf("initRepoCommit: %v", err) + } + } else { + if err = initRepoCommit(tmpDir, repo, u, opts.DefaultBranch); err != nil { + return fmt.Errorf("initRepoCommit: %v", err) + } } } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 2e5e3d2e3..b2e987871 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -267,6 +267,7 @@ func CloudBrainShow(ctx *context.Context) { if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) + jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") ctx.Data["result"] = jobRes taskRoles := jobRes.TaskRoles taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 7fbdf8079..cf3386df2 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -144,11 +144,12 @@ {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} {{end}} - + {{if .IsSigned}} {{svg "octicon-law" 16}} {{.i18n.Tr "repo.balance"}} + {{end}} {{template "custom/extra_tabs" .}} diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 8bd17f080..71aa3b2ce 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -223,7 +223,7 @@ export default { } //不同数据集上传同一个文件 if (file.datasetID != '') { - if (Number(file.datasetID) != file.datasetId) { + if (file.datasetName != "" && file.realName != "") { var info = "该文件已上传,对应数据集(" + file.datasetName + ")-文件(" + file.realName + ")"; window.alert(info); window.location.reload(); diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue index 5d629b94e..1f1697a78 100755 --- a/web_src/js/components/ObsUploader.vue +++ b/web_src/js/components/ObsUploader.vue @@ -219,8 +219,8 @@ export default { await addAttachment(file); } //不同数据集上传同一个文件 - if (file.datasetID != '') { - if (Number(file.datasetID) != file.datasetId) { + if (file.datasetID != '' ) { + if (file.datasetName != "" && file.realName != "") { var info = "该文件已上传,对应数据集(" + file.datasetName + ")-文件(" + file.realName + ")"; window.alert(info); window.location.reload();