aboutsummaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/miscellaneous.go18
-rw-r--r--routers/install.go141
-rw-r--r--routers/repo/branch.go10
-rw-r--r--routers/repo/commit.go18
-rw-r--r--routers/repo/issue.go90
-rw-r--r--routers/repo/repo.go51
-rw-r--r--routers/user/user.go14
7 files changed, 231 insertions, 111 deletions
diff --git a/routers/api/v1/miscellaneous.go b/routers/api/v1/miscellaneous.go
new file mode 100644
index 00000000..0ff1eb04
--- /dev/null
+++ b/routers/api/v1/miscellaneous.go
@@ -0,0 +1,18 @@
+// 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 v1
+
+import (
+ "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func Markdown(ctx *middleware.Context) {
+ content := ctx.Query("content")
+ ctx.Render.JSON(200, map[string]interface{}{
+ "ok": true,
+ "content": string(base.RenderMarkdown([]byte(content), "")),
+ })
+}
diff --git a/routers/install.go b/routers/install.go
index b5c3a936..407705b7 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -6,13 +6,46 @@ package routers
import (
"errors"
+ "os"
+ "strings"
+
+ "github.com/Unknwon/goconfig"
+ "github.com/codegangsta/martini"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/log"
+ "github.com/gogits/gogs/modules/mailer"
"github.com/gogits/gogs/modules/middleware"
)
+// Check run mode(Default of martini is Dev).
+func checkRunMode() {
+ switch base.Cfg.MustValue("", "RUN_MODE") {
+ case "prod":
+ martini.Env = martini.Prod
+ case "test":
+ martini.Env = martini.Test
+ }
+ log.Info("Run Mode: %s", strings.Title(martini.Env))
+}
+
+// GlobalInit is for global configuration reload-able.
+func GlobalInit() {
+ base.NewConfigContext()
+ mailer.NewMailerContext()
+ models.LoadModelsConfig()
+ models.LoadRepoConfig()
+ models.NewRepoContext()
+ if err := models.NewEngine(); err != nil && base.InstallLock {
+ log.Error("%v", err)
+ os.Exit(2)
+ }
+ base.NewServices()
+ checkRunMode()
+}
+
func Install(ctx *middleware.Context, form auth.InstallForm) {
if base.InstallLock {
ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
@@ -20,14 +53,114 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
}
ctx.Data["Title"] = "Install"
- ctx.Data["DbCfg"] = models.DbCfg
- ctx.Data["RepoRootPath"] = base.RepoRootPath
- ctx.Data["RunUser"] = base.RunUser
- ctx.Data["AppUrl"] = base.AppUrl
ctx.Data["PageIsInstall"] = true
+ // Get and assign value to install form.
+ if len(form.Host) == 0 {
+ form.Host = models.DbCfg.Host
+ }
+ if len(form.User) == 0 {
+ form.User = models.DbCfg.User
+ }
+ if len(form.Passwd) == 0 {
+ form.Passwd = models.DbCfg.Pwd
+ }
+ if len(form.DatabaseName) == 0 {
+ form.DatabaseName = models.DbCfg.Name
+ }
+ if len(form.DatabasePath) == 0 {
+ form.DatabasePath = models.DbCfg.Path
+ }
+
+ if len(form.RepoRootPath) == 0 {
+ form.RepoRootPath = base.RepoRootPath
+ }
+ if len(form.RunUser) == 0 {
+ form.RunUser = base.RunUser
+ }
+ if len(form.Domain) == 0 {
+ form.Domain = base.Domain
+ }
+ if len(form.AppUrl) == 0 {
+ form.AppUrl = base.AppUrl
+ }
+
+ auth.AssignForm(form, ctx.Data)
+
if ctx.Req.Method == "GET" {
ctx.HTML(200, "install")
return
}
+
+ if ctx.HasError() {
+ ctx.HTML(200, "install")
+ return
+ }
+
+ // Pass basic check, now test configuration.
+ // Test database setting.
+ dbTypes := map[string]string{"mysql": "mysql", "pgsql": "postgres", "sqlite": "sqlite3"}
+ models.DbCfg.Type = dbTypes[form.Database]
+ models.DbCfg.Host = form.Host
+ models.DbCfg.User = form.User
+ models.DbCfg.Pwd = form.Passwd
+ models.DbCfg.Name = form.DatabaseName
+ models.DbCfg.SslMode = form.SslMode
+ models.DbCfg.Path = form.DatabasePath
+
+ if err := models.NewEngine(); err != nil {
+ ctx.RenderWithErr("Database setting is not correct: "+err.Error(), "install", &form)
+ return
+ }
+
+ // Test repository root path.
+ if err := os.MkdirAll(form.RepoRootPath, os.ModePerm); err != nil {
+ ctx.RenderWithErr("Repository root path is invalid: "+err.Error(), "install", &form)
+ return
+ }
+
+ // Create admin account.
+ if _, err := models.RegisterUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd,
+ IsAdmin: true, IsActive: true}); err != nil {
+ if err != models.ErrUserAlreadyExist {
+ ctx.RenderWithErr("Admin account setting is invalid: "+err.Error(), "install", &form)
+ return
+ }
+ }
+
+ // Save settings.
+ base.Cfg.SetValue("database", "DB_TYPE", models.DbCfg.Type)
+ base.Cfg.SetValue("database", "HOST", models.DbCfg.Host)
+ base.Cfg.SetValue("database", "NAME", models.DbCfg.Name)
+ base.Cfg.SetValue("database", "USER", models.DbCfg.User)
+ base.Cfg.SetValue("database", "PASSWD", models.DbCfg.Pwd)
+ base.Cfg.SetValue("database", "SSL_MODE", models.DbCfg.SslMode)
+ base.Cfg.SetValue("database", "PATH", models.DbCfg.Path)
+
+ base.Cfg.SetValue("repository", "ROOT", form.RepoRootPath)
+ base.Cfg.SetValue("", "RUN_USER", form.RunUser)
+ base.Cfg.SetValue("server", "DOMAIN", form.Domain)
+ base.Cfg.SetValue("server", "ROOT_URL", form.AppUrl)
+
+ if len(form.Host) > 0 {
+ base.Cfg.SetValue("mailer", "ENABLED", "true")
+ base.Cfg.SetValue("mailer", "HOST", form.SmtpHost)
+ base.Cfg.SetValue("mailer", "USER", form.SmtpEmail)
+ base.Cfg.SetValue("mailer", "PASSWD", form.SmtpPasswd)
+
+ base.Cfg.SetValue("service", "REGISTER_EMAIL_CONFIRM", base.ToStr(form.RegisterConfirm == "on"))
+ base.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", base.ToStr(form.MailNotify == "on"))
+ }
+
+ base.Cfg.SetValue("security", "INSTALL_LOCK", "true")
+
+ if err := goconfig.SaveConfigFile(base.Cfg, "custom/conf/app.ini"); err != nil {
+ ctx.RenderWithErr("Fail to save configuration: "+err.Error(), "install", &form)
+ return
+ }
+
+ GlobalInit()
+
+ log.Info("First-time run install finished!")
+ ctx.Redirect("/user/login")
}
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index aed77cfa..c598db43 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -11,21 +11,15 @@ import (
)
func Branches(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
-
- brs, err := models.GetBranches(params["username"], params["reponame"])
+ brs, err := models.GetBranches(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
if err != nil {
- ctx.Handle(200, "repo.Branches", err)
+ ctx.Handle(404, "repo.Branches", err)
return
} else if len(brs) == 0 {
ctx.Handle(404, "repo.Branches", nil)
return
}
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
ctx.Data["Branches"] = brs
ctx.Data["IsRepoToolbarBranches"] = true
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index afc1ffda..449f6443 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -50,16 +50,12 @@ func Commits(ctx *middleware.Context, params martini.Params) {
}
func Diff(ctx *middleware.Context, params martini.Params) {
- userName := params["username"]
- repoName := params["reponame"]
- branchName := params["branchname"]
- commitId := params["commitid"]
+ userName := ctx.Repo.Owner.Name
+ repoName := ctx.Repo.Repository.Name
+ branchName := ctx.Repo.BranchName
+ commitId := ctx.Repo.CommitId
- commit, err := models.GetCommit(userName, repoName, branchName, commitId)
- if err != nil {
- ctx.Handle(404, "repo.Diff", err)
- return
- }
+ commit := ctx.Repo.Commit
diff, err := models.GetDiff(models.RepoPath(userName, repoName), commitId)
if err != nil {
@@ -85,11 +81,9 @@ func Diff(ctx *middleware.Context, params martini.Params) {
return isImage
}
- shortSha := params["commitid"][:10]
ctx.Data["IsImageFile"] = isImageFile
- ctx.Data["Title"] = commit.Message() + " · " + shortSha
+ ctx.Data["Title"] = commit.Message() + " · " + base.ShortSha(commitId)
ctx.Data["Commit"] = commit
- ctx.Data["ShortSha"] = shortSha
ctx.Data["Diff"] = diff
ctx.Data["IsRepoToolbarCommits"] = true
ctx.Data["SourcePath"] = "/" + path.Join(userName, repoName, "src", commitId)
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index c89c8b56..b2253e9f 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -7,6 +7,7 @@ package repo
import (
"fmt"
"net/url"
+ "strings"
"github.com/codegangsta/martini"
@@ -19,10 +20,6 @@ import (
)
func Issues(ctx *middleware.Context) {
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "issue.Issues(invalid repo):", nil)
- }
-
ctx.Data["Title"] = "Issues"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true
@@ -79,10 +76,6 @@ func Issues(ctx *middleware.Context) {
}
func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "issue.CreateIssue(invalid repo):", nil)
- }
-
ctx.Data["Title"] = "Create issue"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = false
@@ -125,10 +118,6 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
}
func ViewIssue(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "issue.ViewIssue(invalid repo):", nil)
- }
-
index, err := base.StrTo(params["index"]).Int()
if err != nil {
ctx.Handle(404, "issue.ViewIssue", err)
@@ -152,7 +141,7 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) {
return
}
issue.Poster = u
- issue.Content = string(base.RenderMarkdown([]byte(issue.Content), ""))
+ issue.RenderedContent = string(base.RenderMarkdown([]byte(issue.Content), ""))
// Get comments.
comments, err := models.GetIssueComments(issue.Id)
@@ -175,16 +164,13 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = issue.Name
ctx.Data["Issue"] = issue
ctx.Data["Comments"] = comments
+ ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner || issue.PosterId == ctx.User.Id
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = false
ctx.HTML(200, "issue/view")
}
func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "issue.UpdateIssue(invalid repo):", nil)
- }
-
index, err := base.StrTo(params["index"]).Int()
if err != nil {
ctx.Handle(404, "issue.UpdateIssue", err)
@@ -216,29 +202,21 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
return
}
- ctx.Data["Title"] = issue.Name
- ctx.Data["Issue"] = issue
+ ctx.JSON(200, map[string]interface{}{
+ "ok": true,
+ "title": issue.Name,
+ "content": string(base.RenderMarkdown([]byte(issue.Content), "")),
+ })
}
func Comment(ctx *middleware.Context, params martini.Params) {
- fmt.Println(ctx.Query("change_status"))
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "issue.Comment(invalid repo):", nil)
- }
-
- index, err := base.StrTo(ctx.Query("issueIndex")).Int()
+ index, err := base.StrTo(ctx.Query("issueIndex")).Int64()
if err != nil {
- ctx.Handle(404, "issue.Comment", err)
+ ctx.Handle(404, "issue.Comment(get index)", err)
return
}
- content := ctx.Query("content")
- if len(content) == 0 {
- ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", ctx.User.Name, ctx.Repo.Repository.Name, index))
- return
- }
-
- issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, int64(index))
+ issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index)
if err != nil {
if err == models.ErrIssueNotExist {
ctx.Handle(404, "issue.Comment", err)
@@ -248,16 +226,46 @@ func Comment(ctx *middleware.Context, params martini.Params) {
return
}
- switch params["action"] {
- case "new":
- if err = models.CreateComment(ctx.User.Id, issue.Id, 0, 0, content); err != nil {
- ctx.Handle(500, "issue.Comment(create comment)", err)
+ // Check if issue owner changes the status of issue.
+ var newStatus string
+ if ctx.Repo.IsOwner || issue.PosterId == ctx.User.Id {
+ newStatus = ctx.Query("change_status")
+ }
+ if len(newStatus) > 0 {
+ if (strings.Contains(newStatus, "Reopen") && issue.IsClosed) ||
+ (strings.Contains(newStatus, "Close") && !issue.IsClosed) {
+ issue.IsClosed = !issue.IsClosed
+ if err = models.UpdateIssue(issue); err != nil {
+ ctx.Handle(200, "issue.Comment(update issue status)", err)
+ return
+ }
+
+ cmtType := models.IT_CLOSE
+ if !issue.IsClosed {
+ cmtType = models.IT_REOPEN
+ }
+
+ if err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, cmtType, ""); err != nil {
+ ctx.Handle(200, "issue.Comment(create status change comment)", err)
+ return
+ }
+ log.Trace("%s Issue(%d) status changed: %v", ctx.Req.RequestURI, issue.Id, !issue.IsClosed)
+ }
+ }
+
+ content := ctx.Query("content")
+ if len(content) > 0 {
+ switch params["action"] {
+ case "new":
+ if err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, models.IT_PLAIN, content); err != nil {
+ ctx.Handle(500, "issue.Comment(create comment)", err)
+ return
+ }
+ log.Trace("%s Comment created: %d", ctx.Req.RequestURI, issue.Id)
+ default:
+ ctx.Handle(404, "issue.Comment", err)
return
}
- log.Trace("%s Comment created: %d", ctx.Req.RequestURI, issue.Id)
- default:
- ctx.Handle(404, "issue.Comment", err)
- return
}
ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", ctx.User.Name, ctx.Repo.Repository.Name, index))
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index b9ac1f1c..c9c9af1e 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -53,20 +53,20 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
}
func Single(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
+ branchName := ctx.Repo.BranchName
+ commitId := ctx.Repo.CommitId
+ userName := ctx.Repo.Owner.Name
+ repoName := ctx.Repo.Repository.Name
- branchName := params["branchname"]
- userName := params["username"]
- repoName := params["reponame"]
+ repoLink := ctx.Repo.RepoLink
+ branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+ rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
// Get tree path
treename := params["_1"]
if len(treename) > 0 && treename[len(treename)-1] == '/' {
- ctx.Redirect("/" + ctx.Repo.Owner.LowerName + "/" +
- ctx.Repo.Repository.Name + "/src/" + branchName + "/" + treename[:len(treename)-1])
+ ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1])
return
}
@@ -84,23 +84,17 @@ func Single(ctx *middleware.Context, params martini.Params) {
}
ctx.Data["Branches"] = brs
- var commitId string
- isViewBranch := models.IsBranchExist(userName, repoName, branchName)
- if !isViewBranch {
- commitId = branchName
- }
+ isViewBranch := ctx.Repo.IsBranch
ctx.Data["IsViewBranch"] = isViewBranch
repoFile, err := models.GetTargetFile(userName, repoName,
branchName, commitId, treename)
+
if err != nil && err != models.ErrRepoFileNotExist {
ctx.Handle(404, "repo.Single(GetTargetFile)", err)
return
}
- branchLink := "/" + ctx.Repo.Owner.LowerName + "/" + ctx.Repo.Repository.Name + "/src/" + branchName
- rawLink := "/" + ctx.Repo.Owner.LowerName + "/" + ctx.Repo.Repository.Name + "/raw/" + branchName
-
if len(treename) != 0 && repoFile == nil {
ctx.Handle(404, "repo.Single", nil)
return
@@ -142,8 +136,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
} else {
// Directory and file list.
- files, err := models.GetReposFiles(userName, repoName,
- branchName, commitId, treename)
+ files, err := models.GetReposFiles(userName, repoName, ctx.Repo.CommitId, treename)
if err != nil {
ctx.Handle(404, "repo.Single(GetReposFiles)", err)
return
@@ -200,18 +193,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
}
}
- // Get latest commit according username and repo name.
- commit, err := models.GetCommit(userName, repoName,
- branchName, commitId)
- if err != nil {
- log.Error("repo.Single(GetCommit): %v", err)
- ctx.Handle(404, "repo.Single(GetCommit)", err)
- return
- }
- ctx.Data["LastCommit"] = commit
-
- ctx.Data["CommitId"] = commitId
-
+ ctx.Data["LastCommit"] = ctx.Repo.Commit
ctx.Data["Paths"] = Paths
ctx.Data["Treenames"] = treenames
ctx.Data["BranchLink"] = branchLink
@@ -219,11 +201,6 @@ func Single(ctx *middleware.Context, params martini.Params) {
}
func SingleDownload(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- ctx.Handle(404, "repo.SingleDownload", nil)
- return
- }
-
// Get tree path
treename := params["_1"]
@@ -263,10 +240,6 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) {
}
func Http(ctx *middleware.Context, params martini.Params) {
- /*if !ctx.Repo.IsValid {
- return
- }*/
-
// TODO: access check
username := params["username"]
diff --git a/routers/user/user.go b/routers/user/user.go
index 114169e6..aeaf91c9 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -120,7 +120,7 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
return
}
- if hasErr, ok := ctx.Data["HasError"]; ok && hasErr.(bool) {
+ if ctx.HasError() {
ctx.HTML(200, "user/signin")
return
}
@@ -308,17 +308,19 @@ func Issues(ctx *middleware.Context) {
showRepos := make([]models.Repository, 0, len(repos))
- var closedIssueCount, createdByCount int
+ isShowClosed := ctx.Query("state") == "closed"
+ var closedIssueCount, createdByCount, allIssueCount int
// Get all issues.
allIssues := make([]models.Issue, 0, 5*len(repos))
for i, repo := range repos {
- issues, err := models.GetIssues(0, repo.Id, posterId, 0, page, false, false, "", "")
+ issues, err := models.GetIssues(0, repo.Id, posterId, 0, page, isShowClosed, false, "", "")
if err != nil {
ctx.Handle(200, "user.Issues(get issues)", err)
return
}
+ allIssueCount += repo.NumIssues
closedIssueCount += repo.NumClosedIssues
// Set repository information to issues.
@@ -330,12 +332,10 @@ func Issues(ctx *middleware.Context) {
repos[i].NumOpenIssues = repo.NumIssues - repo.NumClosedIssues
if repos[i].NumOpenIssues > 0 {
showRepos = append(showRepos, repos[i])
-
}
}
showIssues := make([]models.Issue, 0, len(allIssues))
- isShowClosed := ctx.Query("state") == "closed"
ctx.Data["IsShowClosed"] = isShowClosed
// Get posters and filter issues.
@@ -361,9 +361,9 @@ func Issues(ctx *middleware.Context) {
ctx.Data["Repos"] = showRepos
ctx.Data["Issues"] = showIssues
- ctx.Data["AllIssueCount"] = len(allIssues)
+ ctx.Data["AllIssueCount"] = allIssueCount
ctx.Data["ClosedIssueCount"] = closedIssueCount
- ctx.Data["OpenIssueCount"] = len(allIssues) - closedIssueCount
+ ctx.Data["OpenIssueCount"] = allIssueCount - closedIssueCount
ctx.Data["CreatedByCount"] = createdByCount
ctx.HTML(200, "issue/user")
}
Powered by cgit, Themed by Ted Yin.