| @@ -947,7 +947,6 @@ func isRepositoryExist(e Engine, u *User, repoName string, alias string) (bool, | |||||
| cond = cond.And(builder.Eq{"lower_name": repoName}) | cond = cond.And(builder.Eq{"lower_name": repoName}) | ||||
| } | } | ||||
| count, err := e.Where(cond).Count(&Repository{}) | count, err := e.Where(cond).Count(&Repository{}) | ||||
| //todo 确定从 && 改成 || 是否有问题 | |||||
| return count > 0 || com.IsDir(RepoPath(u.Name, repoName)), err | return count > 0 || com.IsDir(RepoPath(u.Name, repoName)), err | ||||
| } | } | ||||
| @@ -321,7 +321,7 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond { | |||||
| var likes = builder.NewCond() | var likes = builder.NewCond() | ||||
| for _, v := range strings.Split(opts.Keyword, ",") { | for _, v := range strings.Split(opts.Keyword, ",") { | ||||
| likes = likes.Or(builder.Like{"lower_name", strings.ToLower(v)}) | likes = likes.Or(builder.Like{"lower_name", strings.ToLower(v)}) | ||||
| likes = likes.Or(builder.Like{"alias", strings.ToLower(v)}) | |||||
| likes = likes.Or(builder.Like{"alias", v}) | |||||
| if opts.IncludeDescription { | if opts.IncludeDescription { | ||||
| likes = likes.Or(builder.Like{"LOWER(description)", strings.ToLower(v)}) | likes = likes.Or(builder.Like{"LOWER(description)", strings.ToLower(v)}) | ||||
| } | } | ||||
| @@ -33,6 +33,7 @@ func ForkRepository(doer, owner *models.User, oldRepo *models.Repository, name, | |||||
| Owner: owner, | Owner: owner, | ||||
| OwnerName: owner.Name, | OwnerName: owner.Name, | ||||
| Name: name, | Name: name, | ||||
| Alias: oldRepo.Alias, | |||||
| LowerName: strings.ToLower(name), | LowerName: strings.ToLower(name), | ||||
| Description: desc, | Description: desc, | ||||
| DefaultBranch: oldRepo.DefaultBranch, | DefaultBranch: oldRepo.DefaultBranch, | ||||