#4579 #4530 【广州超算】项目设置支持隐藏超算页签

Merged
ychao_1983 merged 1 commits from fix-csh into V20230808 9 months ago
  1. +2
    -0
      models/repo_unit.go
  2. +1
    -0
      options/locale/locale_en-US.ini
  3. +1
    -0
      options/locale/locale_zh-CN.ini
  4. +2
    -2
      routers/repo/setting.go
  5. +7
    -4
      routers/routes/routes.go
  6. +2
    -2
      templates/repo/header.tmpl
  7. +8
    -0
      templates/repo/settings/options.tmpl

+ 2
- 0
models/repo_unit.go View File

@@ -200,6 +200,8 @@ func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) {
r.Config = new(DatasetConfig)
case UnitTypeCloudBrain:
r.Config = new(CloudBrainConfig)
case UnitTypeHPC:
r.Config = new(HPCConfig)
case UnitTypeBlockChain:
r.Config = new(BlockChainConfig)
case UnitTypeModelManage:


+ 1
- 0
options/locale/locale_en-US.ini View File

@@ -2117,6 +2117,7 @@ settings.external_wiki_url_error = The external wiki URL is not a valid URL.
settings.external_wiki_url_desc = Visitors are redirected to the external wiki URL when clicking the wiki tab.
settings.dataset_desc = Enable Repository Dataset
settings.cloudbrain_desc = Enable Cloudbarin
settings.hpc_desc = Enable HPC
settings.model_desc = Enable Model Manage
settings.issues_desc = Enable Repository Issue Tracker
settings.use_internal_issue_tracker = Use Built-In Issue Tracker


+ 1
- 0
options/locale/locale_zh-CN.ini View File

@@ -2133,6 +2133,7 @@ settings.external_wiki_url_error=外部百科链接无效
settings.external_wiki_url_desc=当点击任务标签时,访问者将被重定向到外部任务系统的URL。
settings.dataset_desc=启用数据集
settings.cloudbrain_desc = 启用云脑
settings.hpc_desc = 启用超算
settings.model_desc = 启用模型管理
settings.issues_desc=启用任务系统
settings.use_internal_issue_tracker=使用内置的轻量级任务管理系统


+ 2
- 2
routers/repo/setting.go View File

@@ -280,8 +280,8 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
EnableHPC: form.EnableHPC,
},
})
} else if !models.UnitTypeCloudBrain.UnitGlobalDisabled() {
deleteUnitTypes = append(deleteUnitTypes, models.UnitTypeCloudBrain)
} else if !models.UnitTypeHPC.UnitGlobalDisabled() {
deleteUnitTypes = append(deleteUnitTypes, models.UnitTypeHPC)
}

if form.EnableModelManager && !models.UnitTypeModelManage.UnitGlobalDisabled() {


+ 7
- 4
routers/routes/routes.go View File

@@ -831,6 +831,9 @@ func RegisterRoutes(m *macaron.Macaron) {

reqRepoCloudBrainReader := context.RequireRepoReader(models.UnitTypeCloudBrain)
reqRepoCloudBrainWriter := context.RequireRepoWriter(models.UnitTypeCloudBrain)
reqRepoHPCReader := context.RequireRepoReader(models.UnitTypeHPC)
reqRepoHPCWriter := context.RequireRepoWriter(models.UnitTypeHPC)

reqRepoModelManageReader := context.RequireRepoReader(models.UnitTypeModelManage)
reqRepoModelManageWriter := context.RequireRepoWriter(models.UnitTypeModelManage)
//reqRepoBlockChainReader := context.RequireRepoReader(models.UnitTypeBlockChain)
@@ -1306,10 +1309,10 @@ func RegisterRoutes(m *macaron.Macaron) {
})
}, context.RepoRef())
m.Group("/supercompute", func() {
m.Get("", reqRepoCloudBrainReader, super_compute.GetAPPList)
m.Get("/job", reqRepoCloudBrainReader, super_compute.GetJobList)
m.Get("/job/create", reqRepoCloudBrainWriter, super_compute.CreateUI)
m.Get("/job/:id", reqRepoCloudBrainReader, super_compute.GetDetailUI)
m.Get("", reqRepoHPCReader, super_compute.GetAPPList)
m.Get("/job", reqRepoHPCReader, super_compute.GetJobList)
m.Get("/job/create", reqRepoHPCWriter, super_compute.CreateUI)
m.Get("/job/:id", reqRepoHPCReader, super_compute.GetDetailUI)
})
m.Group("/grampus", func() {
m.Group("/notebook", func() {


+ 2
- 2
templates/repo/header.tmpl View File

@@ -201,9 +201,9 @@
</span>
</a>
{{end}}
{{if .Permission.CanRead $.UnitTypeCloudBrain}}
{{if .Permission.CanRead $.UnitTypeHPC}}
<a class="{{if .PageIsSuperCompute}}active{{end}} item" href="{{.RepoLink}}/supercompute">
<span>
<span>
<svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path d="M14 18V20L16 21V22H8L7.99639 21.0036L10 20V18H2.9918C2.44405 18 2 17.5511 2 16.9925V4.00748C2 3.45107 2.45531 3 2.9918 3H21.0082C21.556 3 22 3.44892 22 4.00748V16.9925C22 17.5489 21.5447 18 21.0082 18H14ZM4 5V14H20V5H4Z"></path></svg>
{{.i18n.Tr "repo.superCompute"}}
</span>


+ 8
- 0
templates/repo/settings/options.tmpl View File

@@ -199,6 +199,14 @@
<label>{{.i18n.Tr "repo.settings.cloudbrain_desc"}}</label>
</div>
</div>
{{$isHPCEnabled := .Repository.UnitEnabled $.UnitTypeHPC }}
<div class="inline field">
<label>{{.i18n.Tr "repo.superCompute"}}</label>
<div class="ui checkbox">
<input class="enable-system" name="enable_hpc" type="checkbox" {{if $isHPCEnabled}}checked{{end}}>
<label>{{.i18n.Tr "repo.settings.hpc_desc"}}</label>
</div>
</div>
{{$isWikiEnabled := or (.Repository.UnitEnabled $.UnitTypeWiki) (.Repository.UnitEnabled $.UnitTypeExternalWiki)}}
<div class="inline field">
<label>{{.i18n.Tr "repo.wiki"}}</label>


Loading…
Cancel
Save