From fb0972afadbd87ae707861acc0986bde01528c3c Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 12 Jun 2014 09:35:51 -0400 Subject: [PATCH] Fix #199 --- gogs.go | 2 +- public/js/app.js | 4 ++-- routers/repo/release.go | 7 ++++++- templates/VERSION | 2 +- templates/release/new.tmpl | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gogs.go b/gogs.go index 41a71c72e..ebb5f8213 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.4.3.0610 Alpha" +const APP_VER = "0.4.3.0612 Alpha" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/public/js/app.js b/public/js/app.js index f56718067..2359e7ea2 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -705,8 +705,8 @@ function initRelease() { (function () { $('[data-ajax-name=release-preview]').on("click", function () { var $this = $(this); - $this.toggleAjax(function (json) { - $($this.data("preview")).html(json.ok ? json.content : "no content"); + $this.toggleAjax(function (resp) { + $($this.data("preview")).html(resp); }, function () { $($this.data("preview")).html("no content"); }) diff --git a/routers/repo/release.go b/routers/repo/release.go index 3e2449ecf..27df3f6d1 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -23,7 +23,12 @@ func (rs *ReleaseSorter) Len() int { } func (rs *ReleaseSorter) Less(i, j int) bool { - return rs.rels[i].NumCommits > rs.rels[j].NumCommits + diffNum := rs.rels[i].NumCommits - rs.rels[j].NumCommits + if diffNum != 0 { + return diffNum > 0 + } + + return rs.rels[i].Created.Second() > rs.rels[j].Created.Second() } func (rs *ReleaseSorter) Swap(i, j int) { diff --git a/templates/VERSION b/templates/VERSION index dc83da786..1eb3e8451 100644 --- a/templates/VERSION +++ b/templates/VERSION @@ -1 +1 @@ -0.4.3.0610 Alpha \ No newline at end of file +0.4.3.0612 Alpha \ No newline at end of file diff --git a/templates/release/new.tmpl b/templates/release/new.tmpl index 6dfe4a5c2..06cb28c78 100644 --- a/templates/release/new.tmpl +++ b/templates/release/new.tmpl @@ -41,12 +41,12 @@
- +
loading...