diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index d1b68b052c..deb282865e 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -73,11 +73,30 @@ func RepoAssignment(redirect bool) martini.Handler { gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) if err != nil { - ctx.Handle(404, "RepoAssignment Invalid repo", err) + ctx.Handle(404, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err) return } ctx.Repo.GitRepo = gitRepo + ctx.Repo.Owner = user + ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name + + ctx.Data["Title"] = user.Name + "/" + repo.Name + ctx.Data["Repository"] = repo + ctx.Data["Owner"] = user + ctx.Data["RepoLink"] = ctx.Repo.RepoLink + ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner + + ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) + ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) + ctx.Data["CloneLink"] = ctx.Repo.CloneLink + + if repo.IsBare { + ctx.Data["IsBareRepo"] = true + ctx.HTML(200, "repo/single_bare") + return + } + detect: if len(branchName) > 0 { // TODO check tag @@ -117,19 +136,8 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) } - ctx.Repo.Owner = user - ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) - ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) - ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name - ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["CommitId"] = ctx.Repo.CommitId - ctx.Data["Repository"] = repo - ctx.Data["Owner"] = user - ctx.Data["Title"] = user.Name + "/" + repo.Name - ctx.Data["CloneLink"] = ctx.Repo.CloneLink - ctx.Data["RepoLink"] = ctx.Repo.RepoLink - ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching } } diff --git a/routers/repo/repo.go b/routers/repo/repo.go index c9c9af1e41..27c806a3b1 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -77,10 +77,6 @@ func Single(ctx *middleware.Context, params martini.Params) { if err != nil { ctx.Handle(404, "repo.Single(GetBranches)", err) return - } else if ctx.Repo.Repository.IsBare { - ctx.Data["IsBareRepo"] = true - ctx.HTML(200, "repo/single") - return } ctx.Data["Branches"] = brs @@ -264,12 +260,6 @@ func Setting(ctx *middleware.Context, params martini.Params) { ctx.Data["IsRepoToolbarSetting"] = true - if ctx.Repo.Repository.IsBare { - ctx.Data["IsBareRepo"] = true - ctx.HTML(200, "repo/setting") - return - } - var title string if t, ok := ctx.Data["Title"].(string); ok { title = t diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl index abaa4e8936..0bf7b0aaf2 100644 --- a/templates/repo/single.tmpl +++ b/templates/repo/single.tmpl @@ -4,9 +4,6 @@ {{template "repo/toolbar" .}}
- {{if .IsBareRepo}} - {{template "repo/single_bare" .}} - {{else}}
{{ $n := len .Treenames}} {{if not .IsFile}}{{end}} @@ -38,7 +35,6 @@ {{else}} {{template "repo/single_list" .}} {{end}} - {{end}}
{{template "base/footer" .}} diff --git a/templates/repo/single_bare.tmpl b/templates/repo/single_bare.tmpl index ed182ad28e..fe0e3aa355 100644 --- a/templates/repo/single_bare.tmpl +++ b/templates/repo/single_bare.tmpl @@ -1,31 +1,39 @@ -
-
-

Quick Guide

-
-
-

Clone this repository

-
- - - - - - - - +{{template "base/head" .}} +{{template "base/navbar" .}} +{{template "repo/nav" .}} +
+
+
+
+

Quick Guide

+
+
+

Clone this repository

+
+ + + + + + + + +
+

We recommend every repository include a README, LICENSE, and .gitignore.

+
+

Create a new repository on the command line

+
touch README.md
+        git init
+        git add README.md
+        git commit -m "first commit"
+        git remote add origin 
+        git push -u origin master
+
+

Push an existing repository from the command line

+
git remote add origin 
+        git push -u origin master
+
-

We recommend every repository include a README, LICENSE, and .gitignore.

-
-

Create a new repository on the command line

-
touch README.md
-git init
-git add README.md
-git commit -m "first commit"
-git remote add origin 
-git push -u origin master
-
-

Push an existing repository from the command line

-
git remote add origin 
-git push -u origin master
-
\ No newline at end of file +
+{{template "base/footer" .}}