diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 1243a7586..e048b98f4 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1324,12 +1324,12 @@ func canUserCreateTrainJobVersion(ctx *context.Context, userID int64) (bool, err log.Error("user unlogin!") return false, nil } - if userID != ctx.User.ID || !ctx.User.IsAdmin { + if userID == ctx.User.ID || ctx.User.IsAdmin { + return true, nil + } else { log.Error("Only user itself and admin can new trainjob!") // ctx.ServerError("Only user itself and admin can new trainjob!", nil) return false, nil - } else { - return true, nil } } diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index fced7a6a8..4c9f38bb0 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -715,7 +715,7 @@ td, th { let scrollHeight = container.scrollHeight let clientHeight = container.clientHeight - if(scrollTop + clientHeight == scrollHeight && scrollHeight>clientHeight){ + if(parseInt(scrollTop) + clientHeight == scrollHeight && scrollHeight>clientHeight){ let end_line = $(`#log${version_name} input[name=end_line]`).val() $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => { if (data.Lines == 0){