From 191b0a0cf66f3dc0ebc578efdd3873e158994b59 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 30 Nov 2022 15:37:49 +0800 Subject: [PATCH 1/5] fix issue --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/user/auth/activate.tmpl | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b6c9ee404..924fba8a0 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -393,6 +393,7 @@ openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry. disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator. email_domain_blacklisted = You cannot register with this kind of email address. +email_domain_blacklisted_change = This type of email address is not currently supported. authorize_application = Authorize Application authorize_redirect_notice = You will be redirected to %s if you authorize this application. authorize_application_created_by = This application was created by %s. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 495063a1f..dae961dfd 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -396,6 +396,7 @@ openid_register_desc=所选的 OpenID URI 未知。在这里关联一个新帐 openid_signin_desc=输入您的 OpenID URI。例如: https://anne.me、bob.openid.org.cn 或 gnusocial.net/carry。 disable_forgot_password_mail=帐户恢复功能已被禁用。请与网站管理员联系。 email_domain_blacklisted=暂不支持此类电子邮件地址注册。 +email_domain_blacklisted_change=暂不支持此类电子邮件地址。 authorize_application=应用授权 authorize_redirect_notice=如果您授权此应用，您将会被重定向到 %s。 authorize_application_created_by=此应用由%s创建。 diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 0a86b6da4..86f7d846d 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -52,7 +52,7 @@
+ pattern="([a-zA-Z0-9_-])+@(163\.com|126\.com|qq\.com|yahoo\.com|sina\.com|sina\.cn|outlook\.com|pcl\.ac\.cn|foxmail\.com|ict\.ac\.cn|21cn\.com|yeah\.net|139\.com)" required>
@@ -72,7 +72,7 @@ $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" }) let emailInput=document.getElementById("email"); emailInput.oninvalid = function () { - this.setCustomValidity('{{.i18n.Tr "auth.email_domain_blacklisted"}}') + this.setCustomValidity('{{.i18n.Tr "auth.email_domain_blacklisted_change"}}') } emailInput.oninput = function(){ this.setCustomValidity('') From c12105d60f68780a3c1b79390e8d3fa504d04a08 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 30 Nov 2022 16:15:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/cloudbrain/cloudbrain.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index f8a6525d2..6111cf460 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -661,6 +661,9 @@ func GetCloudBrainByIdOrJobId(id string) (*models.Cloudbrain,error) { job, err = models.GetCloudbrainByJobID(id) } else { job, err = models.GetCloudbrainByID(id) + if err!=nil{ + job, err = models.GetCloudbrainByJobID(id) + } } return job,err From 8830ed213853a206443878abced03cc7bc2dca92 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 30 Nov 2022 16:59:15 +0800 Subject: [PATCH 3/5] rm log --- routers/repo/cloudbrain_statistic.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 2c63ea70c..880ff7b8a 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -1,7 +1,6 @@ package repo import ( - "fmt" "net/http" "strings" "time" @@ -69,7 +68,6 @@ func summaryDurationStat(statisticTime time.Time) int64 { log.Info("GetCloudbrainByTime err: %v", err) return 0 } - fmt.Printf("ciTasks:", ciTasks[0].Cloudbrain.JobName) models.LoadSpecs4CloudbrainInfo(ciTasks) cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime) From 213c2aab9513ebd7f67d8794e6079c7246ff0eb0 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 30 Nov 2022 17:35:49 +0800 Subject: [PATCH 4/5] fix issue --- templates/repo/header.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 5bac6504c..ee684b8f3 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -133,7 +133,7 @@ {{end}}
{{if not .Repository.IsBeingCreated}} -
+
{{if .Permission.CanRead $.UnitTypeCode}}
From ac3a8637a7b006743bd59b3c854dd46520a8268a Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 30 Nov 2022 18:19:40 +0800 Subject: [PATCH 5/5] fix-bug --- routers/repo/cloudbrain_statistic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 880ff7b8a..6ff377491 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -29,7 +29,7 @@ func CloudbrainDurationStatisticHour() { statisticTime = currentTime } - err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(statisticTime.Unix()), timeutil.TimeStamp(currentTime.Unix())) + err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(statisticTime.Add(-1*time.Hour).Unix()), timeutil.TimeStamp(currentTime.Unix())) if err != nil { log.Error("DeleteCloudbrainDurationStatistic failed", err) }