Skip to content

Commit

Permalink
Added Parent property to the repo API (#1687)
Browse files Browse the repository at this point in the history
Signed-off-by: Guyzmo <[email protected]>
  • Loading branch information
guyzmo authored and appleboy committed May 12, 2017
1 parent 251fb93 commit 397474e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
16 changes: 16 additions & 0 deletions models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,27 @@ func (repo *Repository) APIURL() string {

// APIFormat converts a Repository to api.Repository
func (repo *Repository) APIFormat(mode AccessMode) *api.Repository {
return repo.innerAPIFormat(mode, false)
}

func (repo *Repository) innerAPIFormat(mode AccessMode, isParent bool) *api.Repository {
var parent *api.Repository

cloneLink := repo.CloneLink()
permission := &api.Permission{
Admin: mode >= AccessModeAdmin,
Push: mode >= AccessModeWrite,
Pull: mode >= AccessModeRead,
}
if !isParent {
err := repo.GetBaseRepo()
if err != nil {
log.Error(4, "APIFormat: %v", err)
}
if repo.BaseRepo != nil {
parent = repo.BaseRepo.innerAPIFormat(mode, true)
}
}
return &api.Repository{
ID: repo.ID,
Owner: repo.Owner.APIFormat(),
Expand All @@ -288,6 +303,7 @@ func (repo *Repository) APIFormat(mode AccessMode) *api.Repository {
Empty: repo.IsBare,
Size: int(repo.Size/1024),
Fork: repo.IsFork,
Parent: parent,
Mirror: repo.IsMirror,
HTMLURL: repo.HTMLURL(),
SSHURL: cloneLink.SSH,
Expand Down
1 change: 1 addition & 0 deletions vendor/code.gitea.io/sdk/gitea/repo.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"revisionTime": "2017-05-04T06:58:26Z"
},
{
"checksumSHA1": "L58DGmGw5eZThPkaHEaY9vuz42g=",
"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",
"path": "code.gitea.io/sdk/gitea",
"revision": "1350cdb0d049083453c93dcabfcac2e7ba553951",
"revisionTime": "2017-05-04T17:35:58Z"
"revision": "8cff72208aa458f4efa8fdfbad29b03aee485b8c",
"revisionTime": "2017-05-06T01:37:21Z"
},
{
"checksumSHA1": "bOODD4Gbw3GfcuQPU2dI40crxxk=",
Expand Down

0 comments on commit 397474e

Please sign in to comment.