Browse Source

修复bug

tags/v1.22.2.2^2
ychao_1983 3 years ago
parent
commit
b728b7fa32
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      models/cloudbrain.go
  2. +1
    -1
      routers/admin/cloudbrains.go

+ 1
- 1
models/cloudbrain.go View File

@@ -1038,7 +1038,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
} else { } else {
lowerKeyWord := strings.ToLower(opts.Keyword) lowerKeyWord := strings.ToLower(opts.Keyword)


cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}), builder.Like{"`user`.lower_name", lowerKeyWord})
cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord}))
count, err = sess.Table(&Cloudbrain{}).Where(cond). count, err = sess.Table(&Cloudbrain{}).Where(cond).
Join("left", "`user`", condition).Count(new(CloudbrainInfo)) Join("left", "`user`", condition).Count(new(CloudbrainInfo))




+ 1
- 1
routers/admin/cloudbrains.go View File

@@ -93,7 +93,7 @@ func CloudBrains(ctx *context.Context) {
ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
} }


pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5)
pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum))
pager.SetDefaultParams(ctx) pager.SetDefaultParams(ctx)
pager.AddParam(ctx, "listType", "ListType") pager.AddParam(ctx, "listType", "ListType")
ctx.Data["Page"] = pager ctx.Data["Page"] = pager


Loading…
Cancel
Save