From 1936e86a89f2260f907e25433ecf1d1392d7eb7a Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 24 Sep 2021 10:26:34 +0800 Subject: [PATCH 1/8] fix create cloudbrain button --- templates/repo/cloudbrain/new.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 2e098f862..c45776b89 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -258,9 +258,10 @@ $('#messageInfo p').text(str) return false } - if(!value_image || !value_data){ - return false - } + // if(!value_image || !value_data){ + // console.log("------------------------") + // return false + // } let min_value_task = value_task.toLowerCase() $("input[name='job_name']").attr("value",min_value_task) document.getElementById("mask").style.display = "block" From 8b8c6d4618a4c44ef3f1a7792e450a6a742aa8b0 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 24 Sep 2021 11:14:56 +0800 Subject: [PATCH 2/8] fix bug --- templates/repo/modelarts/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl index fd42670a1..8cfa680f7 100755 --- a/templates/repo/modelarts/new.tmpl +++ b/templates/repo/modelarts/new.tmpl @@ -120,7 +120,7 @@ {{range .attachments}} - + {{end}} From ec998cbc1db31183bcb50ccd7e5ddca69630d017 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 24 Sep 2021 12:15:56 +0800 Subject: [PATCH 3/8] load jobstatus --- templates/repo/cloudbrain/index.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl index 450adf2a5..edab5f752 100755 --- a/templates/repo/cloudbrain/index.tmpl +++ b/templates/repo/cloudbrain/index.tmpl @@ -442,6 +442,7 @@ // 加载任务状态 var timeid = window.setInterval(loadJobStatus, 15000); + $(document).ready(loadJobStatus); function loadJobStatus() { $(".job-status").each((index, job) => { const jobID = job.dataset.jobid; From 73c6f0eacc5414a7667a3ecdb659147a83a947b3 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 24 Sep 2021 16:23:48 +0800 Subject: [PATCH 4/8] modelarts --- templates/repo/modelarts/index.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/repo/modelarts/index.tmpl b/templates/repo/modelarts/index.tmpl index 4aade2d0b..84b8c5235 100755 --- a/templates/repo/modelarts/index.tmpl +++ b/templates/repo/modelarts/index.tmpl @@ -419,6 +419,7 @@ // 加载任务状态 var timeid = window.setInterval(loadJobStatus, 15000); + $(document).ready(loadJobStatus); function loadJobStatus() { $(".job-status").each((index, job) => { const jobID = job.dataset.jobid; From 51c1acd484d4f5973c59909e7b8f4df00f0e4e15 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Sun, 26 Sep 2021 10:17:29 +0800 Subject: [PATCH 5/8] make status correct --- templates/repo/datasets/dataset_list.tmpl | 31 +++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 639028d65..76e2aeb05 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -31,23 +31,28 @@ {{end}} {{if $.Permission.CanWrite $.UnitTypeDatasets}} - {{if (not .CanDel) or $.Repository.IsPrivate}} + {{if not .CanDel}}
- {{$.i18n.Tr "dataset.private"}} + {{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}}
- {{ else }} -
-
- {{$.i18n.Tr "dataset.private"}} -
- {{$.i18n.Tr "dataset.public"}} + {{else}} + {{if $.Repository.IsPrivate}} +
+ {{$.i18n.Tr "dataset.private"}} +
+ {{ else }} +
+
+ {{$.i18n.Tr "dataset.private"}} +
+ {{$.i18n.Tr "dataset.public"}} +
+ {{end}} +
+ {{$.i18n.Tr "dataset.delete"}}
- {{end}} - -
- {{$.i18n.Tr "dataset.delete"}} -
+ {{end}} {{end}}
From d4199d32e880802205fa0b2f5b404eba839da18e Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Sun, 26 Sep 2021 11:38:27 +0800 Subject: [PATCH 6/8] make read-only user see dataset status --- templates/repo/datasets/dataset_list.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 76e2aeb05..2809da474 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -30,12 +30,12 @@ {{end}} - {{if $.Permission.CanWrite $.UnitTypeDatasets}} - {{if not .CanDel}} -
- {{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}} -
- {{else}} + {{if not .CanDel}} +
+ {{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}} +
+ {{else}} + {{if $.Permission.CanWrite $.UnitTypeDatasets}} {{if $.Repository.IsPrivate}}
{{$.i18n.Tr "dataset.private"}} @@ -52,7 +52,7 @@
{{$.i18n.Tr "dataset.delete"}}
- {{end}} + {{end}} {{end}}
From 0610079f08da7bd9f7b2e599f83919824ff5acc5 Mon Sep 17 00:00:00 2001 From: avadesian Date: Sun, 26 Sep 2021 14:26:39 +0800 Subject: [PATCH 7/8] get user info from email new fucntion GetUserByActiveEmail --- models/user.go | 16 ++++++++++++++++ routers/repo/view.go | 27 +++++++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/models/user.go b/models/user.go index 83bf1b2c0..38f699740 100755 --- a/models/user.go +++ b/models/user.go @@ -1543,6 +1543,22 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List { return newCommits } +// GetUserByActivateEmail returns the user object by given e-mail if exists. +/*This function will search email table only*/ +func GetUserByActivateEmail(email string) (*User, error) { + ctx := DefaultDBContext() + var users []User + if err := ctx.e.Join("INNER", "email_address", "email_address.uid = \"user\".id"). + Where("email_address.email= ?", email). + Find(&users); err != nil { + return nil,err + } + if len(users) >= 1 { + return &users[0],nil + }else { + return nil, errors.New("cannot find user by email") + } +} // GetUserByEmail returns the user object by given e-mail if exists. func GetUserByEmail(email string) (*User, error) { return GetUserByEmailContext(DefaultDBContext(), email) diff --git a/routers/repo/view.go b/routers/repo/view.go index 1ee47e12e..1546f53b7 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -15,6 +15,7 @@ import ( "net/url" "path" "strings" + "time" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" @@ -588,39 +589,45 @@ func Home(ctx *context.Context) { //get repo contributors info contributors, err := git.GetContributors(ctx.Repo.Repository.RepoPath()) if err == nil && contributors != nil { + startTime := time.Now() var contributorInfos []*ContributorInfo + contributorInfoHash:= make(map[string]*ContributorInfo) for _, c := range contributors { if strings.Compare(c.Email,"") == 0 { continue } // get user info from committer email - user, err := models.GetUserByEmail(c.Email) + user, err := models.GetUserByActivateEmail(c.Email) if err == nil { // committer is system user, get info through user's primary email - existedContributorInfo := getContributorInfo(contributorInfos,user.Email) - if existedContributorInfo != nil { + if existedContributorInfo,ok:=contributorInfoHash[user.Email];ok { // existed: same primary email, different committer name existedContributorInfo.CommitCnt += c.CommitCnt }else{ // new committer info - contributorInfos = append(contributorInfos, &ContributorInfo{ + var newContributor = &ContributorInfo{ user, user.Email,c.CommitCnt, - }) + } + contributorInfos = append(contributorInfos, newContributor ) + contributorInfoHash[user.Email] = newContributor } } else { // committer is not system user - existedContributorInfo := getContributorInfo(contributorInfos,c.Email) - if existedContributorInfo != nil { + if existedContributorInfo,ok:=contributorInfoHash[c.Email];ok { // existed: same primary email, different committer name existedContributorInfo.CommitCnt += c.CommitCnt }else{ - contributorInfos = append(contributorInfos, &ContributorInfo{ - nil, c.Email,c.CommitCnt, - }) + var newContributor = &ContributorInfo{ + user, c.Email,c.CommitCnt, + } + contributorInfos = append(contributorInfos, newContributor) + contributorInfoHash[c.Email] = newContributor } } } ctx.Data["ContributorInfo"] = contributorInfos + var duration = time.Since(startTime) + log.Info("getContributorInfo cost: %v seconds",duration.Seconds()) } if ctx.Repo.Repository.IsBeingCreated() { task, err := models.GetMigratingTask(ctx.Repo.Repository.ID) From 8e9bbd4ada931c3c7de223fbbf76c5b8177f420e Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Sun, 26 Sep 2021 16:09:45 +0800 Subject: [PATCH 8/8] dataset status --- templates/repo/datasets/dataset_list.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 2809da474..cf6c47926 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -52,6 +52,10 @@
{{$.i18n.Tr "dataset.delete"}}
+ {{else}} +
+ {{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}} +
{{end}} {{end}}