From 833563763cb69d1b8e9362015a47d41478929cda Mon Sep 17 00:00:00 2001 From: Vsevolod Strukchinsky Date: Sun, 9 Feb 2014 20:09:38 +0600 Subject: [PATCH] Added settings to github_add page (fix redirect) --- pkg/handler/repos.go | 4 +++- pkg/template/pages/github_add.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/handler/repos.go b/pkg/handler/repos.go index d5d9f184b..fe3336c01 100644 --- a/pkg/handler/repos.go +++ b/pkg/handler/repos.go @@ -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 { + settings := database.SettingsMust() teams, err := database.ListTeams(u.ID) if err != nil { return err @@ -61,7 +62,8 @@ func RepoAdd(w http.ResponseWriter, r *http.Request, u *User) error { data := struct { User *User Teams []*Team - }{u, teams} + Settings *Settings + }{u, teams, settings} // if the user hasn't linked their GitHub account // render a different template if len(u.GithubToken) == 0 { diff --git a/pkg/template/pages/github_add.html b/pkg/template/pages/github_add.html index 2a6b7079b..f1c5c233a 100644 --- a/pkg/template/pages/github_add.html +++ b/pkg/template/pages/github_add.html @@ -25,6 +25,7 @@ Re-Link Account
+
@@ -85,7 +86,8 @@ if (this.status == 200) { var name = $("input[name=name]").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 { $("#failureAlert").text("Unable to setup the Repository"); $("#failureAlert").show().removeClass("hide");