From 7b60756f2c56314af715fa884388a5654bbfb791 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 3 May 2014 01:37:49 -0400 Subject: Fix Collaborators cannot commit --- cmd/serve.go | 2 +- cmd/update.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/serve.go b/cmd/serve.go index 73dea929..11cf97ad 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -175,7 +175,7 @@ func runServ(k *cli.Context) { qlog.Fatal("Unknown command") } - models.SetRepoEnvs(user.Id, user.Name, repoName) + models.SetRepoEnvs(user.Id, user.Name, repoName, repoUserName) gitcmd := exec.Command(verb, repoPath) gitcmd.Dir = base.RepoRootPath diff --git a/cmd/update.go b/cmd/update.go index b2c73f93..d7efe87f 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -76,10 +76,10 @@ func runUpdate(c *cli.Context) { //updateEnv(args[0], args[1], args[2]) userName := os.Getenv("userName") - userId := os.Getenv("userId") - iUserId, _ := strconv.ParseInt(userId, 10, 64) + userId, _ := strconv.ParseInt(os.Getenv("userId"), 10, 64) //repoId := os.Getenv("repoId") + repoUserName := os.Getenv("repoUserName") repoName := os.Getenv("repoName") - models.Update(args[0], args[1], args[2], userName, repoName, iUserId) + models.Update(args[0], args[1], args[2], userName, repoUserName, repoName, userId) } -- cgit v1.2.3