From 9ab07d7cd78e507e7c44e13cf0de4e05f2958bd5 Mon Sep 17 00:00:00 2001 From: Andy Gardner Date: Wed, 25 Feb 2015 16:38:22 +0200 Subject: [PATCH 1/2] Including repo.role for non admins to allow rebuild button to display --- server/handler/repo.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/handler/repo.go b/server/handler/repo.go index 98c79f4d6..687c5cd26 100644 --- a/server/handler/repo.go +++ b/server/handler/repo.go @@ -30,7 +30,10 @@ func GetRepo(c web.C, w http.ResponseWriter, r *http.Request) { // if the user is not requesting (or cannot access) // admin data then we just return the repo as-is if role.Admin == false { - json.NewEncoder(w).Encode(repo) + json.NewEncoder(w).Encode(struct { + *model.Repo + Perm *model.Perm `json:"role"` + }{repo, role}) return } From fbc701f22b9d82a88dc3826d15e0275d88e11a81 Mon Sep 17 00:00:00 2001 From: Andy Gardner Date: Thu, 26 Feb 2015 10:22:06 +0200 Subject: [PATCH 2/2] Fixing formatting with gofmt --- server/handler/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handler/repo.go b/server/handler/repo.go index 687c5cd26..843baed01 100644 --- a/server/handler/repo.go +++ b/server/handler/repo.go @@ -32,7 +32,7 @@ func GetRepo(c web.C, w http.ResponseWriter, r *http.Request) { if role.Admin == false { json.NewEncoder(w).Encode(struct { *model.Repo - Perm *model.Perm `json:"role"` + Perm *model.Perm `json:"role"` }{repo, role}) return }