diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0465faf9ad..45ed52bd58 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1629,12 +1629,12 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { var err error condition := "cloudbrain.user_id = `user`.id" if len(opts.Keyword) == 0 { - count, err = sess.Where(cond).Count(new(Cloudbrain)) + count, err = sess.Unscoped().Where(cond).Count(new(Cloudbrain)) } else { lowerKeyWord := strings.ToLower(opts.Keyword) cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord})) - count, err = sess.Table(&Cloudbrain{}).Where(cond). + count, err = sess.Table(&Cloudbrain{}).Unscoped().Where(cond). Join("left", "`user`", condition).Count(new(CloudbrainInfo)) } diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index b979729a81..2090a2cf2c 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -23,7 +23,7 @@ func DownloadCloudBrainBoard(ctx *context.Context) { _, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ Page: page, - PageSize: 1, + PageSize: pageSize, }, Type: models.TypeCloudBrainAll, NeedRepoInfo: false, diff --git a/routers/user/home.go b/routers/user/home.go index 9c7bed2df9..d92bc31c6a 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -804,6 +804,7 @@ func Cloudbrains(ctx *context.Context) { repos, _, err := models.SearchRepository(&models.SearchRepoOptions{ Actor: ctx.User, OwnerID: ctxUser.ID, + Private: true, }) if err != nil { ctx.ServerError("SearchRepository", err) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 35c08eeef4..cf5df847c6 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -162,9 +162,9 @@ {{end}} -
+ {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index ba8ec10f8c..0b0776c9b3 100644 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -147,9 +147,9 @@ {{end}} -
+ {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}