diff options
| author | Unknwon <u@gogs.io> | 2016-07-24 00:23:54 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-07-24 00:23:54 +0800 |
| commit | 46e96c008cf966428c9dad71c7871de88186e3fe (patch) | |
| tree | 57e276d8f971c74a6dac841352ec2bee96e93d8f /models | |
| parent | 256cd6374adf646a46265efe18a2d3f822bf7269 (diff) | |
| download | gitea-46e96c008cf966428c9dad71c7871de88186e3fe.tar.gz gitea-46e96c008cf966428c9dad71c7871de88186e3fe.zip | |
Use struct for UI settings
Diffstat (limited to 'models')
| -rw-r--r-- | models/action.go | 4 | ||||
| -rw-r--r-- | models/issue.go | 8 | ||||
| -rw-r--r-- | models/user.go | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/models/action.go b/models/action.go index d4a07ced39..62252c6c58 100644 --- a/models/action.go +++ b/models/action.go @@ -470,8 +470,8 @@ func CommitRepoAction( } } - if len(commit.Commits) > setting.FeedMaxCommitNum { - commit.Commits = commit.Commits[:setting.FeedMaxCommitNum] + if len(commit.Commits) > setting.UI.FeedMaxCommitNum { + commit.Commits = commit.Commits[:setting.UI.FeedMaxCommitNum] } bs, err := json.Marshal(commit) diff --git a/models/issue.go b/models/issue.go index 74d5356150..f3cbb71e8f 100644 --- a/models/issue.go +++ b/models/issue.go @@ -521,7 +521,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) { opts.Page = 1 } - sess := x.Limit(setting.IssuePagingNum, (opts.Page-1)*setting.IssuePagingNum) + sess := x.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum) if opts.RepoID > 0 { sess.Where("issue.repo_id=?", opts.RepoID).And("issue.is_closed=?", opts.IsClosed) @@ -579,7 +579,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) { } } - issues := make([]*Issue, 0, setting.IssuePagingNum) + issues := make([]*Issue, 0, setting.UI.IssuePagingNum) return issues, sess.Find(&issues) } @@ -1143,10 +1143,10 @@ func GetAllRepoMilestones(repoID int64) ([]*Milestone, error) { // GetMilestones returns a list of milestones of given repository and status. func GetMilestones(repoID int64, page int, isClosed bool) ([]*Milestone, error) { - miles := make([]*Milestone, 0, setting.IssuePagingNum) + miles := make([]*Milestone, 0, setting.UI.IssuePagingNum) sess := x.Where("repo_id=? AND is_closed=?", repoID, isClosed) if page > 0 { - sess = sess.Limit(setting.IssuePagingNum, (page-1)*setting.IssuePagingNum) + sess = sess.Limit(setting.UI.IssuePagingNum, (page-1)*setting.UI.IssuePagingNum) } return miles, sess.Find(&miles) } diff --git a/models/user.go b/models/user.go index 1050f2231c..44dedccadf 100644 --- a/models/user.go +++ b/models/user.go @@ -988,7 +988,7 @@ type SearchUserOptions struct { Type UserType OrderBy string Page int - PageSize int // Can be smaller than or equal to setting.ExplorePagingNum + PageSize int // Can be smaller than or equal to setting.UI.ExplorePagingNum } // SearchUserByName takes keyword and part of user name to search, @@ -999,8 +999,8 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error) } opts.Keyword = strings.ToLower(opts.Keyword) - if opts.PageSize <= 0 || opts.PageSize > setting.ExplorePagingNum { - opts.PageSize = setting.ExplorePagingNum + if opts.PageSize <= 0 || opts.PageSize > setting.UI.ExplorePagingNum { + opts.PageSize = setting.UI.ExplorePagingNum } if opts.Page <= 0 { opts.Page = 1 |