Browse Source

Show branches in repo viewer

for-closed-social
Unknown 10 years ago
parent
commit
685631627e
5 changed files with 40 additions and 14 deletions
  1. +1
    -1
      README.md
  2. +2
    -1
      bee.json
  3. +20
    -4
      models/repo2.go
  4. +7
    -0
      routers/repo/single.go
  5. +10
    -8
      templates/repo/single.tmpl

+ 1
- 1
README.md View File

@ -5,7 +5,7 @@ Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language.
Since we choose to use pure Go implmentation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Max OS X, and Windows with **ZERO** dependency. Since we choose to use pure Go implmentation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Max OS X, and Windows with **ZERO** dependency.
##### Current version: 0.0.8 Alpha
##### Current version: 0.0.9 Alpha
## Purpose ## Purpose

+ 2
- 1
bee.json View File

@ -12,7 +12,8 @@
"models": "", "models": "",
"others": [ "others": [
"modules", "modules",
"$GOPATH/src/github.com/gogits/binding"
"$GOPATH/src/github.com/gogits/binding",
"$GOPATH/src/github.com/gogits/git"
] ]
}, },
"cmd_args": [ "cmd_args": [

+ 20
- 4
models/repo2.go View File

@ -8,7 +8,7 @@ import (
"path" "path"
"time" "time"
git "github.com/gogits/git"
"github.com/gogits/git"
) )
type RepoFile struct { type RepoFile struct {
@ -19,10 +19,26 @@ type RepoFile struct {
Size int64 Size int64
} }
func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) {
f := RepoPath(userName, reposName)
func GetBranches(userName, reposName string) ([]string, error) {
repo, err := git.OpenRepository(RepoPath(userName, reposName))
if err != nil {
return nil, err
}
refs, err := repo.AllReferences()
if err != nil {
return nil, err
}
brs := make([]string, len(refs))
for i, ref := range refs {
brs[i] = ref.Name
}
return brs, nil
}
repo, err := git.OpenRepository(f)
func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) {
repo, err := git.OpenRepository(RepoPath(userName, reposName))
if err != nil { if err != nil {
return nil, err return nil, err
} }

+ 7
- 0
routers/repo/single.go View File

@ -33,6 +33,13 @@ func Single(ctx *middleware.Context, params martini.Params) {
ctx.Data["Reponame"] = params["reponame"] ctx.Data["Reponame"] = params["reponame"]
ctx.Data["Branchname"] = params["branchname"] ctx.Data["Branchname"] = params["branchname"]
brs, err := models.GetBranches(params["username"], params["reponame"])
if err != nil {
ctx.Handle(200, "repo.Single", err)
return
}
ctx.Data["Branches"] = brs
var treenames []string var treenames []string
Paths := make([]string, 0) Paths := make([]string, 0)

+ 10
- 8
templates/repo/single.tmpl View File

@ -5,21 +5,23 @@
<div id="gogs-body" class="container"> <div id="gogs-body" class="container">
<div id="gogs-source"> <div id="gogs-source">
<div class="source-toolbar"> <div class="source-toolbar">
{{ $username := .Username}}
{{ $reponame := .Reponame}}
{{ $branchname := .Branchname}}
{{ $treenames := .Treenames}}
{{ $repoLink := .RepositoryLink}}
{{ $n := len $treenames}}
<button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button> <button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button>
<div class="dropdown branch-switch"> <div class="dropdown branch-switch">
<a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master&nbsp;&nbsp;
<a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>{{$branchname}}&nbsp;&nbsp;
<b class="caret"></b></a> <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="current" href="/{{.RepositoryLink}}/tree/master">master</a></li>
<li><a href="/{{.RepositoryLink}}/tree/develop">develop</a></li>
{{range .Branches}}
<li><a {{if eq . $branchname}}class="current" {{end}}href="/{{$repoLink}}/tree/{{.}}">{{.}}</a></li>
{{end}}
</ul> </ul>
</div> </div>
{{$paths := .Paths}} {{$paths := .Paths}}
{{ $username := .Username}}
{{ $reponame := .Reponame}}
{{ $branchname := .Branchname}}
{{ $treenames := .Treenames}}
{{ $n := len $treenames}}
{{ $l := Subtract $n 1}} {{ $l := Subtract $n 1}}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="root dir"><a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}">{{.Repository.Name}}</a></li> <li class="root dir"><a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}">{{.Repository.Name}}</a></li>

Loading…
Cancel
Save