added Limit method to Engine struct; use engine variable when provide…

…d; fixed gitignore

models/issue_reaction.go

@@ -69,12 +69,13 @@ func FindIssueReactions(issue *Issue, listOptions ListOptions) (ReactionList, er
 
 func findReactions(e Engine, opts FindReactionsOptions) ([]*Reaction, error) {
 	var reactions []*Reaction
-	sess := e.Where(opts.toConds())
+	sess := e
 	if opts.Page != 0 {
-		sess = opts.setSessionPagination(sess)
+		sess = opts.setEnginePagination(e)
 	}
 
 	return reactions, sess.
+		Where(opts.toConds()).
 		In("reaction.`type`", setting.UI.Reactions).
 		Asc("reaction.issue_id", "reaction.comment_id", "reaction.created_unix", "reaction.id").
 		Find(&reactions)

models/issue_tracked_time.go

@@ -74,19 +74,17 @@ func (opts *FindTrackedTimesOptions) ToSession(e Engine) *xorm.Session {
 		sess = e.Join("INNER", "issue", "issue.id = tracked_time.issue_id")
 	}
 
-	if opts.Page != 0 {
-		if sess == nil {
-			sess = opts.getPaginatedSession()
-		} else {
-			sess = opts.setSessionPagination(sess)
-		}
+	if sess == nil {
+		sess = e.Where(opts.ToCond())
+	} else {
+		sess = sess.Where(opts.ToCond())
 	}
 
-	if sess == nil {
-		return e.Where(opts.ToCond())
+	if opts.Page != 0 {
+		sess = opts.setSessionPagination(sess)
 	}
 
-	return sess.Where(opts.ToCond())
+	return sess
 }
 
 // GetTrackedTimes returns all tracked times that fit to the given options.

models/list_options.go

@@ -23,6 +23,12 @@ func (opts ListOptions) setSessionPagination(sess *xorm.Session) *xorm.Session {
 	return sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
 }
 
+func (opts ListOptions) setEnginePagination(e Engine) Engine {
+	opts.setDefaultValues()
+
+	return e.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
+}
+
 func (opts ListOptions) setDefaultValues() {
 	if opts.PageSize <= 0 || opts.PageSize > setting.UI.ExplorePagingNum {
 		opts.PageSize = setting.UI.ExplorePagingNum

models/models.go

@@ -44,6 +44,7 @@ type Engine interface {
 	SQL(interface{}, ...interface{}) *xorm.Session
 	Where(interface{}, ...interface{}) *xorm.Session
 	Asc(colNames ...string) *xorm.Session
+	Limit(limit int, start ...int) *xorm.Session
 }
 
 var (

models/org_team.go

@@ -760,17 +760,13 @@ func GetTeamMembers(teamID int64) ([]*User, error) {
 }
 
 func getUserTeams(e Engine, userID int64, listOptions ListOptions) (teams []*Team, err error) {
-	if listOptions.Page == 0 {
-		return teams, e.
-			Join("INNER", "team_user", "team_user.team_id = team.id").
-			Where("team_user.uid=?", userID).
-			Find(&teams)
-	}
-
-	return teams, listOptions.getPaginatedSession().
+	sess := e.
 		Join("INNER", "team_user", "team_user.team_id = team.id").
-		Where("team_user.uid=?", userID).
-		Find(&teams)
+		Where("team_user.uid=?", userID)
+	if listOptions.Page != 0 {
+		sess = listOptions.setSessionPagination(sess)
+	}
+	return teams, sess.Find(&teams)
 }
 
 func getUserOrgTeams(e Engine, orgID, userID int64) (teams []*Team, err error) {

models/repo_collaboration.go

@@ -57,8 +57,7 @@ func (repo *Repository) getCollaborations(e Engine, listOptions ListOptions) ([]
 	if listOptions.Page == 0 {
 		return collaborations, e.Find(&collaborations, &Collaboration{RepoID: repo.ID})
 	}
-
-	return collaborations, listOptions.getPaginatedSession().Find(&collaborations, &Collaboration{RepoID: repo.ID})
+	return collaborations, listOptions.setEnginePagination(e).Find(&collaborations, &Collaboration{RepoID: repo.ID})
 }
 
 // Collaborator represents a user with collaboration details.

options/gitignore/Matlab

@@ -24,8 +24,5 @@ codegen/
 # Simulink autosave extension
 *.autosave
 
-# Simulink cache files
-*.slxc
-
 # Octave session info
 octave-workspace