summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-11 12:14:11 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-11 12:14:11 -0400
commit11f54b142699b59a74b9babc195e712414a3c78a (patch)
treec5b51d2a78c0bb8a75e518d99169e7d0abb15466
parent65c2c629825c527085e5a0ab09dad9ebbf323aaa (diff)
downloadgitea-11f54b142699b59a74b9babc195e712414a3c78a.tar.gz
gitea-11f54b142699b59a74b9babc195e712414a3c78a.zip
Mirror bug fix
Diffstat
-rw-r--r--modules/base/template.go3
-rw-r--r--modules/middleware/context.go2
-rw-r--r--routers/user/user.go14
-rw-r--r--templates/repo/diff.tmpl330
4 files changed, 13 insertions, 336 deletions
diff --git a/modules/base/template.go b/modules/base/template.go
index 5a42107c45..6241497969 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -67,6 +67,9 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"TimeSince": TimeSince,
"FileSize": FileSize,
"Subtract": Subtract,
+ "Add": func(a, b int) int {
+ return a + b
+ },
"ActionIcon": ActionIcon,
"ActionDesc": ActionDesc,
"DateFormat": DateFormat,
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 6ee94b960b..e7f962c3ed 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -103,7 +103,7 @@ func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
func (ctx *Context) Handle(status int, title string, err error) {
log.Error("%s: %v", title, err)
if martini.Dev == martini.Prod {
- ctx.HTML(500, "status/500")
+ ctx.HTML(200, "status/500")
return
}
diff --git a/routers/user/user.go b/routers/user/user.go
index 37c6baa9f2..39dfa462b8 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -24,14 +24,14 @@ func Dashboard(ctx *middleware.Context) {
ctx.Data["PageIsUserDashboard"] = true
repos, err := models.GetRepositories(&models.User{Id: ctx.User.Id})
if err != nil {
- ctx.Handle(200, "user.Dashboard", err)
+ ctx.Handle(500, "user.Dashboard", err)
return
}
ctx.Data["MyRepos"] = repos
feeds, err := models.GetFeeds(ctx.User.Id, 0, false)
if err != nil {
- ctx.Handle(200, "user.Dashboard", err)
+ ctx.Handle(500, "user.Dashboard", err)
return
}
ctx.Data["Feeds"] = feeds
@@ -44,7 +44,7 @@ func Profile(ctx *middleware.Context, params martini.Params) {
// TODO: Need to check view self or others.
user, err := models.GetUserByName(params["username"])
if err != nil {
- ctx.Handle(200, "user.Profile", err)
+ ctx.Handle(500, "user.Profile", err)
return
}
@@ -57,14 +57,14 @@ func Profile(ctx *middleware.Context, params martini.Params) {
case "activity":
feeds, err := models.GetFeeds(user.Id, 0, true)
if err != nil {
- ctx.Handle(200, "user.Profile", err)
+ ctx.Handle(500, "user.Profile", err)
return
}
ctx.Data["Feeds"] = feeds
default:
repos, err := models.GetRepositories(user)
if err != nil {
- ctx.Handle(200, "user.Profile", err)
+ ctx.Handle(500, "user.Profile", err)
return
}
ctx.Data["Repos"] = repos
@@ -100,14 +100,14 @@ func SignIn(ctx *middleware.Context) {
user, err := models.GetUserByName(userName)
if err != nil {
- ctx.HTML(200, "user/signin")
+ ctx.HTML(500, "user/signin")
return
}
secret := base.EncodeMd5(user.Rands + user.Passwd)
value, _ := ctx.GetSecureCookie(secret, base.CookieRememberName)
if value != user.Name {
- ctx.HTML(200, "user/signin")
+ ctx.HTML(500, "user/signin")
return
}
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index 396aa795f5..a041284d00 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -30,7 +30,7 @@
{{range .Diff.Files}}
<li>
<div class="diff-counter count pull-right">
- {{if Subtract .Addition .Deletion}}
+ {{if Add .Addition .Deletion}}
<span class="add" data-line="{{.Addition}}">{{.Addition}}</span>
<span class="bar">
<span class="pull-left add"></span>
@@ -53,7 +53,7 @@
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-2">
<div class="panel-heading">
<div class="diff-counter count pull-left">
- {{if Subtract .Addition .Deletion}}
+ {{if Add .Addition .Deletion}}
<span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
<span class="bar">
<span class="pull-left add"></span>
@@ -91,338 +91,12 @@
</tr>
{{end}}
{{end}}
- <!-- <tr class="same-code nl-2 ol-2">
- <td class="lines-num lines-num-old">
- <span rel="L1">2</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">2</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-3 ol-3">
- <td class="lines-num lines-num-old">
- <span rel="L3">3</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L3">3</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="add-code nl-4 ol-0">
- <td class="lines-num lines-num-old">
- <span rel="add">+</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L4">4</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="add-code nl-5 ol-0">
- <td class="lines-num lines-num-old">
- <span rel="add">+</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L5">5</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-4">
- <td class="lines-num lines-num-old">
- <span rel="L4">4</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-5">
- <td class="lines-num lines-num-old">
- <span rel="L5">5</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-6">
- <td class="lines-num lines-num-old">
- <span rel="L6">6</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-7">
- <td class="lines-num lines-num-old">
- <span rel="L7">7</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-6 ol-8">
- <td class="lines-num lines-num-old">
- <span rel="L8">8</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L6">6</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-7 ol-9">
- <td class="lines-num lines-num-old">
- <span rel="L1">9</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">7</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-8 ol-10">
- <td class="lines-num lines-num-old">
- <span rel="L1">10</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">8</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr> -->
</tbody>
</table>
{{end}}
</div>
</div>
{{end}}
-
- <!-- <div class="panel panel-default diff-file-box diff-box file-content">
- <div class="panel-heading">
- <div class="diff-counter count pull-left">
- <span class="add" data-line="2">+ 2</span>
- <span class="bar">
- <span class="pull-left add"></span>
- <span class="pull-left del"></span>
- </span>
- <span class="del" data-line="4">- 4</span>
- </div>
- <a class="btn btn-default btn-sm pull-right" href="#">View File</a>
- <span class="file">data/test/bson_test/simple_type.go</span>
- </div>
- <div class="panel-body file-body file-code code-view code-diff">
- <table>
- <tbody>
- <tr class="same-code nl-1 ol-1">
- <td class="lines-num lines-num-old">
- <span rel="L1">1</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">1</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-2 ol-2">
- <td class="lines-num lines-num-old">
- <span rel="L1">2</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">2</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-3 ol-3">
- <td class="lines-num lines-num-old">
- <span rel="L3">3</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L3">3</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="add-code nl-4 ol-0">
- <td class="lines-num lines-num-old">
- <span rel="add">+</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L4">4</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="add-code nl-5 ol-0">
- <td class="lines-num lines-num-old">
- <span rel="add">+</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L5">5</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-4">
- <td class="lines-num lines-num-old">
- <span rel="L4">4</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-5">
- <td class="lines-num lines-num-old">
- <span rel="L5">5</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-6">
- <td class="lines-num lines-num-old">
- <span rel="L6">6</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="del-code nl-0 ol-7">
- <td class="lines-num lines-num-old">
- <span rel="L7">7</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="del">-</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-6 ol-8">
- <td class="lines-num lines-num-old">
- <span rel="L8">8</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L6">6</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-7 ol-9">
- <td class="lines-num lines-num-old">
- <span rel="L1">9</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">7</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-8 ol-10">
- <td class="lines-num lines-num-old">
- <span rel="L1">10</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">8</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="ellipsis-code">
- <td class="text-center lines-ellipsis" colspan="2">
- <i class="fa fa-ellipsis-h"></i>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-8 ol-10">
- <td class="lines-num lines-num-old">
- <span rel="L1">10</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">8</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- <tr class="same-code nl-8 ol-10">
- <td class="lines-num lines-num-old">
- <span rel="L1">10</span>
- </td>
- <td class="lines-num lines-num-new">
- <span rel="L1">8</span>
- </td>
- <td class="lines-code">
- <pre> "github.com/youtube/vitess/go/bson"</pre>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div class="panel panel-default diff-file-box diff-box file-content">
- <div class="panel-heading">
- <div class="diff-counter count pull-left">
- <span class="add" data-line="0">BIN</span>
- <span class="bar">
- <span class="pull-left add"></span>
- <span class="pull-left del"></span>
- </span>
- <span class="del" data-line="1"></span>
- </div>
- <a class="btn btn-default btn-sm pull-right" href="#">View File</a>
- <span class="file">data/test/bson_test/simple_type.png</span>
- </div>
- <div class="panel-body file-body file-code code-view code-bin">
- <table>
- <tbody>
- <tr class="text-center"><td><img src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=200" alt=""/></td></tr>
- </tbody>
- </table>
- </div>
- </div> -->
</div>
</div>
{{template "base/footer" .}}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 14:33:54 +0000