MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-22 18:00:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #540

Browse source
This commit is contained in:
Unknwon 2014-10-12 02:06:46 -04:00
parent 452ccff81c
commit 0d7b9065c6
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
models/org.go
View file

@ -845,23 +845,8 @@ func IsTeamMember(orgId, teamId, uid int64) bool {
// GetTeamMembers returns all members in given team of organization. // GetTeamMembers returns all members in given team of organization.
func GetTeamMembers(orgId, teamId int64) ([]*User, error) { func GetTeamMembers(orgId, teamId int64) ([]*User, error) {
/*tus := make([]*TeamUser, 0, 10) us := make([]*User, 0, 10)
err := x.Sql("SELECT * FROM user JOIN team_user ON team_user.team_id = ? AND team_user.uid = user.id", teamId).Find(&us)
err := x.Where("org_id=?", orgId).And("team_id=?", teamId).Find(&tus)
if err != nil {
return nil, err
}
us := make([]*User, len(tus))
for i, tu := range tus {
us[i], err = GetUserById(tu.Uid)
if err != nil {
return nil, err
}
}*/
us := make([]*User, 0)
err := x.Sql("select * from user join team_user on team_user.team_id = ? and team_user.uid = user.id", teamId).Find(&us)
return us, err return us, err
} }

2
public/ng/js/gogs.js
View file

@ -718,7 +718,7 @@ function initDiff() {
$('.diff-detail-box>a').click(function () { $('.diff-detail-box>a').click(function () {
$($(this).data('target')).slideToggle(100); $($(this).data('target')).slideToggle(100);
}) })
var $counter = $('.diff-counter'); var $counter = $('.diff-counter');
if ($counter.length < 1) { if ($counter.length < 1) {
return; return;