aboutsummaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/dev/template.go25
-rw-r--r--routers/repo/repo.go6
-rw-r--r--routers/repo/single.go6
-rw-r--r--routers/user/user.go17
4 files changed, 51 insertions, 3 deletions
diff --git a/routers/dev/template.go b/routers/dev/template.go
new file mode 100644
index 00000000..7d5225ec
--- /dev/null
+++ b/routers/dev/template.go
@@ -0,0 +1,25 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package dev
+
+import (
+ "github.com/codegangsta/martini"
+
+ "github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func TemplatePreview(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["User"] = models.User{Name: "Unknown"}
+ ctx.Data["AppName"] = base.AppName
+ ctx.Data["AppVer"] = base.AppVer
+ ctx.Data["AppUrl"] = base.AppUrl
+ ctx.Data["AppLogo"] = base.AppLogo
+ ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374"
+ ctx.Data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60
+ ctx.Data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60
+ ctx.HTML(200, params["_1"], ctx.Data)
+}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index fb54d4ef..b38473b1 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -13,11 +13,11 @@ import (
func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
ctx.Data["Title"] = "Create repository"
+ ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
+ ctx.Data["LanguageIgns"] = models.LanguageIgns
+ ctx.Data["Licenses"] = models.Licenses
if ctx.Req.Method == "GET" {
- ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
- ctx.Data["LanguageIgns"] = models.LanguageIgns
- ctx.Data["Licenses"] = models.Licenses
ctx.HTML(200, "repo/create", ctx.Data)
return
}
diff --git a/routers/repo/single.go b/routers/repo/single.go
index 3ab34630..3d0447ed 100644
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -5,6 +5,7 @@
package repo
import (
+ "fmt"
"strings"
"github.com/codegangsta/martini"
@@ -137,6 +138,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
}
}
+ fmt.Println(Paths)
+
ctx.Data["Paths"] = Paths
ctx.Data["Treenames"] = treenames
ctx.Data["IsRepoToolbarSource"] = true
@@ -189,6 +192,9 @@ func Commits(ctx *middleware.Context, params martini.Params) {
ctx.Error(404)
return
}
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+ ctx.Data["CommitCount"] = commits.Len()
ctx.Data["Commits"] = commits
ctx.HTML(200, "repo/commits", ctx.Data)
}
diff --git a/routers/user/user.go b/routers/user/user.go
index da70ced9..37070af3 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -243,4 +243,21 @@ func Activate(ctx *middleware.Context) {
ctx.Render.HTML(200, "user/active", ctx.Data)
return
}
+
+ // Verify code.
+ if user := models.VerifyUserActiveCode(code); user != nil {
+ user.IsActive = true
+ user.Rands = models.GetUserSalt()
+ models.UpdateUser(user)
+
+ log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.LowerName)
+
+ ctx.Session.Set("userId", user.Id)
+ ctx.Session.Set("userName", user.Name)
+ ctx.Redirect("/", 302)
+ return
+ }
+
+ ctx.Data["IsActivateFailed"] = true
+ ctx.Render.HTML(200, "user/active", ctx.Data)
}