Browse Source

Merge branch 'fix-1985' of https://git.openi.org.cn/OpenI/aiforge into fix-1985

pull/2117/head
zhoupzh 3 years ago
parent
commit
a56877b6a7
2 changed files with 9 additions and 5 deletions
  1. +4
    -2
      modules/cloudbrain/cloudbrain.go
  2. +5
    -3
      templates/org/home.tmpl

+ 4
- 2
modules/cloudbrain/cloudbrain.go View File

@@ -1,10 +1,12 @@
package cloudbrain

import (
"code.gitea.io/gitea/modules/timeutil"
"encoding/json"
"errors"
"strconv"
"strings"

"code.gitea.io/gitea/modules/timeutil"

"code.gitea.io/gitea/modules/storage"

@@ -188,7 +190,7 @@ func AdminOrImageCreaterRight(ctx *context.Context) {


func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, brainScorePath, jobType, gpuQueue, description, branchName, bootFile, params string, benchmarkTypeID, benchmarkChildTypeID, resourceSpecId int) error {
image = strings.TrimSpace(image)
dataActualPath := setting.Attachment.Minio.RealPath +
setting.Attachment.Minio.Bucket + "/" +
setting.Attachment.Minio.BasePath +


+ 5
- 3
templates/org/home.tmpl View File

@@ -39,7 +39,6 @@
</a>
{{end}}
{{end}}

{{if .OrgTopics}}
<a class=" tag_key ui small tag_lable topic omit icon_a" onclick="isUnfold()" id="icon_btn" >
<i class="ri-arrow-down-s-line" style="display:inline-block;vertical-align:top"></i>
@@ -168,7 +167,10 @@
document.getElementById("icon_btn").innerHTML="<i class=\"ri-arrow-down-s-line\" style=\"display:inline-block;vertical-align:top\"></i> &nbsp {{.i18n.Tr "org.unfold"}}"
}
}
isShowIconBtn()
iscontinueStatus()

if ({{.OrgTopics}}.length>0){
isShowIconBtn()
iscontinueStatus()
}
</script>

Loading…
Cancel
Save