Fix #540

diff --git a/models/org.go b/models/org.go
index 1297cb6d81e5c1db6573d04fd6122ae8c1a3f154..08d276bf86c21689f5734ecada631696aaaba94c 100644 (file)
--- 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 538e6c679a00881b055f04dd4c168ca9f10871ed..eba1744b930328f94aa28bcdfdfbc11dfe1214ef 100644 (file)
--- 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;