Browse Source

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

tags/v1.2.0-rc1
Unknwon 11 years ago
parent
commit
97b39ae2e4
4 changed files with 7 additions and 6 deletions
  1. +3
    -2
      cmd/web.go
  2. +1
    -1
      gogs.go
  3. +2
    -2
      public/ng/js/gogs.js
  4. +1
    -1
      templates/.VERSION

+ 3
- 2
cmd/web.go View File

@@ -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], ".")


+ 1
- 1
gogs.go View File

@@ -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())


+ 2
- 2
public/ng/js/gogs.js View File

@@ -214,7 +214,7 @@ var Gogs = {};
if (json.ok && json.data.length) {
var html = '';
$.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)) {
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();
});
}


+ 1
- 1
templates/.VERSION View File

@@ -1 +1 @@
0.5.9.1217 Beta
0.5.10.1222 Beta

Loading…
Cancel
Save