coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix invite bug(shouldn't include full name to search box)

This commit is contained in:
Unknwon 2014-12-22 03:44:49 -05:00
parent 030b3d751e
commit 97b39ae2e4
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/web.go
View File

@ -75,9 +75,10 @@ func checkVersion() {
// Check dependency version. // Check dependency version.
checkers := []VerChecker{ checkers := []VerChecker{
{"github.com/Unknwon/macaron", macaron.Version, "0.4.7"}, {"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/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 { for _, c := range checkers {
ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".") ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.9.1217 Beta" const APP_VER = "0.5.10.1222 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
public/ng/js/gogs.js
View File

@ -214,7 +214,7 @@ var Gogs = {};
if (json.ok && json.data.length) { if (json.ok && json.data.length) {
var html = ''; var html = '';
$.each(json.data, function (i, item) { $.each(json.data, function (i, item) {
html += '<li><a><img src="' + item.avatar_url + '">' + item.username; html += '<li><a><img src="' + item.avatar_url + '"><span class="username">' + item.username + '</span>';
if (notEmpty(item.full_name)) { if (notEmpty(item.full_name)) {
html += ' (' + item.full_name + ')'; html += ' (' + item.full_name + ')';
} }
@ -571,7 +571,7 @@ function initInvite() {
$ul.toggleShow(); $ul.toggleShow();
} }
}).next().next().find('ul').on("click", 'li', function () { }).next().next().find('ul').on("click", 'li', function () {
$('#org-member-invite').val($(this).text()); $('#org-member-invite').val($(this).find('.username').text());
$ul.toggleHide(); $ul.toggleHide();
}); });
} }

2
templates/.VERSION
View File

@ -1 +1 @@
0.5.9.1217 Beta 0.5.10.1222 Beta