diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 464827445..a08bbf4dc 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -353,7 +353,7 @@ func GetMilestonesByRepoID(repoID int64, state api.StateType, listOptions ListOp } miles := make([]*Milestone, 0, listOptions.PageSize) - return miles, sess.Asc("deadline_unix").Asc("id").Find(&miles) + return miles, sess.Desc("id").Find(&miles) } // GetMilestones returns a list of milestones of given repository and status. diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d58a61756..b58021ea2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -778,6 +778,10 @@ datasets = Datasets datasets.desc = Enable Dataset cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc. +model_manager = Model +model_noright=No right +model_rename=Duplicate model name, please modify model name. + debug=Debug stop=Stop delete=Delete @@ -1127,6 +1131,7 @@ issues.filter_label_exclude = `Use alt + click/enter t issues.filter_label_no_select = All labels issues.filter_milestone = Milestone issues.filter_milestone_no_select = All milestones +issues.filter_milestone_no_add = Not add milestones issues.filter_assignee = Assignee issues.filter_assginee_no_select = All assignees issues.filter_type = Type diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 45cabda8f..f5a52f2cb 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -784,6 +784,7 @@ cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等 model_manager = 模型 model_noright=无权限操作 +model_rename=模型名称重复，请修改模型名称 debug=调试 stop=停止 @@ -1140,6 +1141,7 @@ issues.filter_label_exclude=`使用 alt + 鼠标左键 / 回 issues.filter_label_no_select=所有标签 issues.filter_milestone=里程碑筛选 issues.filter_milestone_no_select=所有里程碑 +issues.filter_milestone_no_add=未添加里程碑 issues.filter_assignee=指派人筛选 issues.filter_assginee_no_select=所有指派成员 issues.filter_type=类型筛选 diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index ad68f5b99..669bdf9fa 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -105,6 +105,23 @@ func saveModelByParameters(jobId string, versionName string, name string, versio return nil } +func SaveNewNameModel(ctx *context.Context) { + name := ctx.Query("Name") + if name == "" { + ctx.Error(500, fmt.Sprintf("name or version is null.")) + return + } + + aimodels := models.QueryModelByName(name, ctx.Repo.Repository.ID) + if len(aimodels) > 0 { + ctx.Error(500, ctx.Tr("repo.model_rename")) + return + } + SaveModel(ctx) + + log.Info("save model end.") +} + func SaveModel(ctx *context.Context) { log.Info("save model start.") JobId := ctx.Query("JobId") diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 7aa8151da..7ab5eb283 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -357,7 +357,8 @@ func Issues(ctx *context.Context) { var err error // Get milestones. - ctx.Data["Milestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateAll, models.ListOptions{}) + ctx.Data["OpenMilestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateOpen, models.ListOptions{}) + ctx.Data["ClosedMilestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateClosed, models.ListOptions{}) if err != nil { ctx.ServerError("GetAllRepoMilestones", err) return diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go index e30e6371f..41f1f88bc 100644 --- a/routers/repo/milestone.go +++ b/routers/repo/milestone.go @@ -268,6 +268,7 @@ func MilestoneIssuesAndPulls(ctx *context.Context) { ctx.Data["CanWriteIssues"] = ctx.Repo.CanWriteIssuesOrPulls(false) ctx.Data["CanWritePulls"] = ctx.Repo.CanWriteIssuesOrPulls(true) + ctx.Data["PageIsIssueList"] = true ctx.HTML(200, tplMilestoneIssues) } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d2a094bc8..1578e2f28 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -274,7 +274,7 @@ func NotebookDel(ctx *context.Context) { return } - if task.Status != string(models.JobStopped) { + if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped){ log.Error("the job(%s) has not been stopped", task.JobName) ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped")) return diff --git a/routers/routes/routes.go b/routers/routes/routes.go index cfd962603..784efc6be 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -977,6 +977,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, context.RepoRef()) m.Group("/modelmanage", func() { m.Post("/create_model", reqRepoModelManageWriter, repo.SaveModel) + m.Post("/create_new_model", reqRepoModelManageWriter, repo.SaveNewNameModel) m.Delete("/delete_model", repo.DeleteModel) m.Put("/modify_model", repo.ModifyModelInfo) m.Get("/show_model", reqRepoModelManageReader, repo.ShowModelTemplate) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 34c3a3121..08bf3e825 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -337,7 +337,8 @@ {{end}}
- 全部 {{svg "octicon-chevron-right" 16}} + + 全部 {{svg "octicon-chevron-right" 16}}
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index e7cb8b19f..96d4c0ab5 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,3 +1,11 @@ + {{template "base/head" .}}
{{template "repo/header" .}} @@ -57,16 +65,41 @@
-
+
{{.i18n.Tr "repo.issues.filter_milestone"}}
{{.i18n.Tr "repo.issues.filter_milestone_no_select"}} - {{range .Milestones}} - {{.Name}} - {{end}} + {{.i18n.Tr "repo.issues.filter_milestone_no_add"}} + + + {{if .OpenMilestones}} +
+
+ {{svg "octicon-milestone" 12 }} + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
+ {{range .OpenMilestones}} + + {{.Name}} + + {{end}} + {{end}} + + {{if .ClosedMilestones}} +
+
+ {{svg "octicon-milestone" 12}} + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
+ {{range .ClosedMilestones}} + + {{.Name}} + + {{end}} + {{end}}
diff --git a/web_src/js/components/Contributors.vue b/web_src/js/components/Contributors.vue index 1384b4e49..cd85f6ae9 100644 --- a/web_src/js/components/Contributors.vue +++ b/web_src/js/components/Contributors.vue @@ -45,6 +45,8 @@ export default { data() { return { url:'', + url_infor:'', + href_:'', contributors_list:[], contributors_list_page:[], currentPage:1, @@ -56,7 +58,7 @@ export default { methods: { getContributorsList(){ - this.$axios.get(this.url+'/list').then((res)=>{ + this.$axios.get(this.url+'/list?'+this.url_infor).then((res)=>{ this.contributors_list = res.data.contributor_info this.totalNum = this.contributors_list.length this.contributors_list_page = this.contributors_list.slice(0,this.pageSize) @@ -78,6 +80,10 @@ created(){ this.url = url; let strIndex = this.url.indexOf("contributors") this.url_code = this.url.substr(0,strIndex) + + this.href_ = window.location.href; + let index = this.href_.indexOf("?") + this.url_infor = this.href_.substring(index+1,this.href_.length) this.getContributorsList() }, diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 8006b0c91..0699f957e 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -52,7 +52,7 @@ export default { previewTemplate += ' '; previewTemplate += '
\n '; - previewTemplate += '
\n '; + previewTemplate += '
\n '; previewTemplate += '
\n '; previewTemplate += '
'; previewTemplate += diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue index b0796fe81..3b5bd3162 100755 --- a/web_src/js/components/ObsUploader.vue +++ b/web_src/js/components/ObsUploader.vue @@ -53,7 +53,7 @@ export default { previewTemplate += ' '; previewTemplate += '
\n '; - previewTemplate += '
\n '; + previewTemplate += '
\n '; previewTemplate += ' \n '; previewTemplate += '
'; previewTemplate +=