From 97b39ae2e4acc3cbdef0dbfb110d6eebf2c1977b Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 22 Dec 2014 03:44:49 -0500 Subject: [PATCH] fix invite bug(shouldn't include full name to search box) --- cmd/web.go | 5 +++-- gogs.go | 2 +- public/ng/js/gogs.js | 4 ++-- templates/.VERSION | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/web.go b/cmd/web.go index 1da1f2500b..2251ea9218 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -75,9 +75,10 @@ func checkVersion() { // Check dependency version. checkers := []VerChecker{ {"github.com/Unknwon/macaron", macaron.Version, "0.4.7"}, - {"github.com/macaron-contrib/binding", binding.Version, "0.0.3"}, + {"github.com/macaron-contrib/binding", binding.Version, "0.0.4"}, + {"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"}, {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"}, - {"github.com/macaron-contrib/session", session.Version, "0.0.5"}, + {"github.com/macaron-contrib/session", session.Version, "0.1.0"}, } for _, c := range checkers { ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".") diff --git a/gogs.go b/gogs.go index c8053b2800..04141dad3d 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.9.1217 Beta" +const APP_VER = "0.5.10.1222 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js index ee14fb401f..ff38bda9d6 100644 --- a/public/ng/js/gogs.js +++ b/public/ng/js/gogs.js @@ -214,7 +214,7 @@ var Gogs = {}; if (json.ok && json.data.length) { var html = ''; $.each(json.data, function (i, item) { - html += '
  • ' + item.username; + html += '
  • ' + item.username + ''; if (notEmpty(item.full_name)) { html += ' (' + item.full_name + ')'; } @@ -571,7 +571,7 @@ function initInvite() { $ul.toggleShow(); } }).next().next().find('ul').on("click", 'li', function () { - $('#org-member-invite').val($(this).text()); + $('#org-member-invite').val($(this).find('.username').text()); $ul.toggleHide(); }); } diff --git a/templates/.VERSION b/templates/.VERSION index a4d3f0f947..801600a4bd 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.9.1217 Beta \ No newline at end of file +0.5.10.1222 Beta \ No newline at end of file