From 0d7b9065c60604a1ac37af595878d86b0c0679ad Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Sun, 12 Oct 2014 02:06:46 -0400
Subject: [PATCH] Fix #540

---
 models/org.go        | 19 ++-----------------
 public/ng/js/gogs.js |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/models/org.go b/models/org.go
index 1297cb6d81..08d276bf86 100644
--- a/models/org.go
+++ b/models/org.go
@@ -845,23 +845,8 @@ func IsTeamMember(orgId, teamId, uid int64) bool {
 
 // GetTeamMembers returns all members in given team of organization.
 func GetTeamMembers(orgId, teamId int64) ([]*User, error) {
-	/*tus := make([]*TeamUser, 0, 10)
-
-	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)
+	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)
 	return us, err
 }
 
diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index 538e6c679a..eba1744b93 100644
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -718,7 +718,7 @@ function initDiff() {
     $('.diff-detail-box>a').click(function () {
         $($(this).data('target')).slideToggle(100);
     })
-    
+
     var $counter = $('.diff-counter');
     if ($counter.length < 1) {
         return;