darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added settings to github_add page (fix redirect)

Browse source
This commit is contained in:
Vsevolod Strukchinsky 2014-02-09 20:09:38 +06:00
parent 44d5f3baca
commit 833563763c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/handler/repos.go
View file

@ -54,6 +54,7 @@ func RepoDashboard(w http.ResponseWriter, r *http.Request, u *User, repo *Repo)
} }
func RepoAdd(w http.ResponseWriter, r *http.Request, u *User) error { func RepoAdd(w http.ResponseWriter, r *http.Request, u *User) error {
settings := database.SettingsMust()
teams, err := database.ListTeams(u.ID) teams, err := database.ListTeams(u.ID)
if err != nil { if err != nil {
return err return err
@ -61,7 +62,8 @@ func RepoAdd(w http.ResponseWriter, r *http.Request, u *User) error {
data := struct { data := struct {
User *User User *User
Teams []*Team Teams []*Team
}{u, teams} Settings *Settings
}{u, teams, settings}
// if the user hasn't linked their GitHub account // if the user hasn't linked their GitHub account
// render a different template // render a different template
if len(u.GithubToken) == 0 { if len(u.GithubToken) == 0 {

4
pkg/template/pages/github_add.html
View file

@ -25,6 +25,7 @@
<a class="btn btn-default pull-right" href="/auth/login/github" style="font-size: 18px;background:#f4f4f4;">Re-Link Account</a> <a class="btn btn-default pull-right" href="/auth/login/github" style="font-size: 18px;background:#f4f4f4;">Re-Link Account</a>
</div> </div>
<form class="form-repo" method="POST" action="/new/github.com"> <form class="form-repo" method="POST" action="/new/github.com">
<input type="hidden" name="domain" autocomplete="off" value="{{.Settings.GitHubDomain}}">
<div class="field-group"> <div class="field-group">
<div> <div>
<label>GitHub Owner</label> <label>GitHub Owner</label>
@ -85,7 +86,8 @@
if (this.status == 200) { if (this.status == 200) {
var name = $("input[name=name]").val() var name = $("input[name=name]").val()
var owner = $("input[name=owner]").val() var owner = $("input[name=owner]").val()
window.location.pathname = "/github.com/"+owner+"/"+name var domain = $("input[name=domain]").val()
window.location.pathname = "/" + domain + "/"+owner+"/"+name
} else { } else {
$("#failureAlert").text("Unable to setup the Repository"); $("#failureAlert").text("Unable to setup the Repository");
$("#failureAlert").show().removeClass("hide"); $("#failureAlert").show().removeClass("hide");