#1384 add pagination for repositories

This commit is contained in:
Unknwon committed 2016-07-24 14:32:46 +08:00
1 parent 1f2e173a74
commit e74630ae3b
21 files changed
+360 -192

No files matched your search

+1 -1
View File
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current tip version: 0.9.53 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
##### Current tip version: 0.9.54 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
| Web | UI | Preview |
|:-------------:|:-------:|:-------:|
+1
View File
@@ -124,6 +124,7 @@ uname_holder = Username or email
password_holder = Password
switch_dashboard_context = Switch Dashboard Context
my_repos = My Repositories
show_more_repos = Show more repositories...
collaborative_repos = Collaborative Repositories
my_orgs = My Organizations
my_mirrors = My Mirrors
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.9.53.0724"
const APP_VER = "0.9.54.0724"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
+10 -16
View File
@@ -121,23 +121,17 @@ func (u *User) GetRepositoryAccesses() (map[*Repository]AccessMode, error) {
return repos, nil
}
// GetAccessibleRepositories finds all repositories where a user has access but does not own.
func (u *User) GetAccessibleRepositories() ([]*Repository, error) {
accesses := make([]*Access, 0, 10)
if err := x.Find(&accesses, &Access{UserID: u.ID}); err != nil {
return nil, err
// GetAccessibleRepositories finds repositories which the user has access but does not own.
// If limit is smaller than 1 means returns all found results.
func (user *User) GetAccessibleRepositories(limit int) (repos []*Repository, _ error) {
sess := x.Where("owner_id !=? ", user.ID).Desc("updated_unix")
if limit > 0 {
sess.Limit(limit)
repos = make([]*Repository, 0, limit)
} else {
repos = make([]*Repository, 0, 10)
}
if len(accesses) == 0 {
return []*Repository{}, nil
}
repoIDs := make([]int64, 0, len(accesses))
for _, access := range accesses {
repoIDs = append(repoIDs, access.RepoID)
}
repos := make([]*Repository, 0, len(repoIDs))
return repos, x.Where("owner_id != ?", u.ID).In("id", repoIDs).Desc("updated_unix").Find(&repos)
return repos, sess.Join("INNER", "access", "access.user_id = ? AND access.repo_id = repository.id", user.ID).Find(&repos)
}
func maxAccessMode(modes ...AccessMode) AccessMode {
+11 -10
View File
@@ -602,21 +602,22 @@ func MergePullRequestAction(actUser *User, repo *Repository, pull *Issue) error
}
// GetFeeds returns action list of given user in given context.
// userID is the user who's requesting, ctxUserID is the user/org that is requested.
// userID can be -1, if isProfile is true or in order to skip the permission check.
func GetFeeds(ctxUserID, userID, offset int64, isProfile bool) ([]*Action, error) {
// actorID is the user who's requesting, ctxUserID is the user/org that is requested.
// actorID can be -1 when isProfile is true or to skip the permission check.
func GetFeeds(ctxUser *User, actorID, offset int64, isProfile bool) ([]*Action, error) {
actions := make([]*Action, 0, 20)
sess := x.Limit(20, int(offset)).Desc("id").Where("user_id=?", ctxUserID)
sess := x.Limit(20, int(offset)).Desc("id").Where("user_id = ?", ctxUser.ID)
if isProfile {
sess.And("is_private=?", false).And("act_user_id=?", ctxUserID)
} else if ctxUserID != -1 {
ctxUser := &User{ID: ctxUserID}
if err := ctxUser.GetUserRepositories(userID); err != nil {
return nil, err
sess.And("is_private = ?", false).And("act_user_id = ?", ctxUser.ID)
} else if actorID != -1 && ctxUser.IsOrganization() {
// FIXME: only need to get IDs here, not all fields of repository.
repos, _, err := ctxUser.GetUserRepositories(actorID, 1, ctxUser.NumRepos)
if err != nil {
return nil, fmt.Errorf("GetUserRepositories: %v", err)
}
var repoIDs []int64
for _, repo := range ctxUser.Repos {
for _, repo := range repos {
repoIDs = append(repoIDs, repo.ID)
}
+1 -1
View File
@@ -82,7 +82,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {
return nil
}
func (issue *Issue) LoadAttributes() (err error) {
func (issue *Issue) LoadAttributes() error {
return issue.loadAttributes(x)
}
+3 -3
View File
@@ -98,8 +98,8 @@ func LoadConfigs() {
func getEngine() (*xorm.Engine, error) {
cnnstr := ""
var Param string = "?"
if strings.Contains(DbCfg.Name,Param) {
Param="&"
if strings.Contains(DbCfg.Name, Param) {
Param = "&"
}
switch DbCfg.Type {
case "mysql":
@@ -206,7 +206,7 @@ func GetStatistic() (stats Statistic) {
stats.Counter.User = CountUsers()
stats.Counter.Org = CountOrganizations()
stats.Counter.PublicKey, _ = x.Count(new(PublicKey))
stats.Counter.Repo = CountRepositories()
stats.Counter.Repo = CountRepositories(true)
stats.Counter.Watch, _ = x.Count(new(Watch))
stats.Counter.Star, _ = x.Count(new(Star))
stats.Counter.Action, _ = x.Count(new(Action))
+102 -47
View File
@@ -10,8 +10,10 @@ import (
"os"
"strings"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
)
var (
@@ -313,9 +315,9 @@ func GetOrgUsersByOrgID(orgID int64) ([]*OrgUser, error) {
}
// ChangeOrgUserStatus changes public or private membership status.
func ChangeOrgUserStatus(orgId, uid int64, public bool) error {
func ChangeOrgUserStatus(orgID, uid int64, public bool) error {
ou := new(OrgUser)
has, err := x.Where("uid=?", uid).And("org_id=?", orgId).Get(ou)
has, err := x.Where("uid=?", uid).And("org_id=?", orgID).Get(ou)
if err != nil {
return err
} else if !has {
@@ -328,8 +330,8 @@ func ChangeOrgUserStatus(orgId, uid int64, public bool) error {
}
// AddOrgUser adds new user to given organization.
func AddOrgUser(orgId, uid int64) error {
if IsOrganizationMember(orgId, uid) {
func AddOrgUser(orgID, uid int64) error {
if IsOrganizationMember(orgID, uid) {
return nil
}
@@ -341,13 +343,13 @@ func AddOrgUser(orgId, uid int64) error {
ou := &OrgUser{
Uid: uid,
OrgID: orgId,
OrgID: orgID,
}
if _, err := sess.Insert(ou); err != nil {
sess.Rollback()
return err
} else if _, err = sess.Exec("UPDATE `user` SET num_members = num_members + 1 WHERE id = ?", orgId); err != nil {
} else if _, err = sess.Exec("UPDATE `user` SET num_members = num_members + 1 WHERE id = ?", orgID); err != nil {
sess.Rollback()
return err
}
@@ -356,35 +358,39 @@ func AddOrgUser(orgId, uid int64) error {
}
// RemoveOrgUser removes user from given organization.
func RemoveOrgUser(orgId, uid int64) error {
func RemoveOrgUser(orgID, userID int64) error {
ou := new(OrgUser)
has, err := x.Where("uid=?", uid).And("org_id=?", orgId).Get(ou)
has, err := x.Where("uid=?", userID).And("org_id=?", orgID).Get(ou)
if err != nil {
return fmt.Errorf("get org-user: %v", err)
} else if !has {
return nil
}
u, err := GetUserByID(uid)
user, err := GetUserByID(userID)
if err != nil {
return fmt.Errorf("GetUserById: %v", err)
return fmt.Errorf("GetUserByID [%d]: %v", userID, err)
}
org, err := GetUserByID(orgId)
org, err := GetUserByID(orgID)
if err != nil {
return fmt.Errorf("get organization: %v", err)
} else if err = org.GetRepositories(); err != nil {
return fmt.Errorf("GetRepositories: %v", err)
return fmt.Errorf("GetUserByID [%d]: %v", orgID, err)
}
// FIXME: only need to get IDs here, not all fields of repository.
repos, _, err := org.GetUserRepositories(user.ID, 1, org.NumRepos)
if err != nil {
return fmt.Errorf("GetUserRepositories [%d]: %v", user.ID, err)
}
// Check if the user to delete is the last member in owner team.
if IsOrganizationOwner(orgId, uid) {
if IsOrganizationOwner(orgID, userID) {
t, err := org.GetOwnerTeam()
if err != nil {
return err
}
if t.NumMembers == 1 {
return ErrLastOrgOwner{UID: uid}
return ErrLastOrgOwner{UID: userID}
}
}
@@ -396,28 +402,29 @@ func RemoveOrgUser(orgId, uid int64) error {
if _, err := sess.Id(ou.ID).Delete(ou); err != nil {
return err
} else if _, err = sess.Exec("UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgId); err != nil {
} else if _, err = sess.Exec("UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgID); err != nil {
return err
}
// Delete all repository accesses.
access := &Access{UserID: u.ID}
for _, repo := range org.Repos {
access.RepoID = repo.ID
if _, err = sess.Delete(access); err != nil {
return err
} else if err = watchRepo(sess, u.ID, repo.ID, false); err != nil {
// Delete all repository accesses and unwatch them.
repoIDs := make([]int64, len(repos))
for i := range repos {
repoIDs = append(repoIDs, repos[i].ID)
if err = watchRepo(sess, user.ID, repos[i].ID, false); err != nil {
return err
}
}
if _, err = sess.Where("user_id = ?", user.ID).In("repo_id", repoIDs).Delete(new(Access)); err != nil {
return err
}
// Delete member in his/her teams.
teams, err := getUserTeams(sess, org.ID, u.ID)
teams, err := getUserTeams(sess, org.ID, user.ID)
if err != nil {
return err
}
for _, t := range teams {
if err = removeTeamMember(sess, org.ID, t.ID, u.ID); err != nil {
if err = removeTeamMember(sess, org.ID, t.ID, user.ID); err != nil {
return err
}
}
@@ -438,38 +445,86 @@ func RemoveOrgRepo(orgID, repoID int64) error {
return removeOrgRepo(x, orgID, repoID)
}
// GetUserRepositories gets all repositories of an organization,
// that the user with the given userID has access to.
func (org *User) GetUserRepositories(userID int64) (err error) {
// GetUserTeamIDs returns of all team IDs of the organization that user is memeber of.
// It returns [-1] if user is not memeber of any teams.
func (org *User) GetUserTeamIDs(userID int64) ([]int64, error) {
teams := make([]*Team, 0, org.NumTeams)
if err = x.Sql(`SELECT team.id FROM team
INNER JOIN team_user ON team_user.team_id = team.id
WHERE team_user.org_id = ? AND team_user.uid = ?`, org.ID, userID).Find(&teams); err != nil {
return fmt.Errorf("get teams: %v", err)
if err := x.Sql(`SELECT team.id FROM team
INNER JOIN team_user ON team_user.team_id = team.id
WHERE team_user.org_id = ? AND team_user.uid = ?`, org.ID, userID).Find(&teams); err != nil {
return nil, err
}
teamIDs := make([]string, len(teams))
teamIDs := make([]int64, len(teams))
for i := range teams {
teamIDs[i] = com.ToStr(teams[i].ID)
teamIDs[i] = teams[i].ID
}
if len(teamIDs) == 0 {
// user has no team but "IN ()" is invalid SQL
teamIDs = append(teamIDs, "-1") // there is no repo with id=-1
teamIDs = append(teamIDs, -1) // there is no repo with id=-1
}
return teamIDs, nil
}
// GetUserRepositories returns repositories of the organization
// that the user with the given userID has access to.
func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repository, int64, error) {
teamIDs, err := org.GetUserTeamIDs(userID)
if err != nil {
return nil, 0, fmt.Errorf("GetUserTeamIDs: %v", err)
}
repos := make([]*Repository, 0, 5)
if page <= 0 {
page = 1
}
repos := make([]*Repository, 0, pageSize)
// FIXME: use XORM chain operations instead of raw SQL.
if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository
INNER JOIN team_repo ON team_repo.repo_id = repository.id
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
GROUP BY repository.id`, strings.Join(teamIDs, ",")), org.ID, false).Find(&repos); err != nil {
return fmt.Errorf("get repositories: %v", err)
INNER JOIN team_repo
ON team_repo.repo_id = repository.id
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
GROUP BY repository.id
ORDER BY updated_unix DESC
LIMIT %d OFFSET %d`,
strings.Join(base.Int64sToStrings(teamIDs), ","), pageSize, (page-1)*pageSize),
org.ID, false).Find(&repos); err != nil {
return nil, 0, fmt.Errorf("get repositories: %v", err)
}
org.Repos = repos
// FIXME: should I change this value inside method,
// or only in location of caller where it's really needed?
org.NumRepos = len(org.Repos)
return nil
results, err := x.Query(fmt.Sprintf(`SELECT repository.id FROM repository
INNER JOIN team_repo
ON team_repo.repo_id = repository.id
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
GROUP BY repository.id
ORDER BY updated_unix DESC`,
strings.Join(base.Int64sToStrings(teamIDs), ",")),
org.ID, false)
if err != nil {
log.Error(4, "count user repositories in organization: %v", err)
}
return repos, int64(len(results)), nil
}
// GetUserRepositories returns mirror repositories of the organization
// that the user with the given userID has access to.
func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error) {
teamIDs, err := org.GetUserTeamIDs(userID)
if err != nil {
return nil, fmt.Errorf("GetUserTeamIDs: %v", err)
}
repos := make([]*Repository, 0, 10)
if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository
INNER JOIN team_repo
ON team_repo.repo_id = repository.id AND repository.is_mirror = ?
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
GROUP BY repository.id`,
strings.Join(base.Int64sToStrings(teamIDs), ",")),
true, org.ID, false).Find(&repos); err != nil {
return nil, fmt.Errorf("get repositories: %v", err)
}
return repos, nil
}
// GetTeams returns all teams that belong to organization,
+125 -40
View File
@@ -1018,11 +1018,14 @@ func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error
return repo, sess.Commit()
}
func countRepositories(showPrivate bool) int64 {
sess := x.NewSession()
func countRepositories(userID int64, private bool) int64 {
sess := x.Where("id > 0")
if !showPrivate {
sess.Where("is_private=?", false)
if userID > 0 {
sess.And("owner_id = ?", userID)
}
if !private {
sess.And("is_private=?", false)
}
count, err := sess.Count(new(Repository))
@@ -1033,13 +1036,17 @@ func countRepositories(showPrivate bool) int64 {
}
// CountRepositories returns number of repositories.
func CountRepositories() int64 {
return countRepositories(true)
// Argument private only takes effect when it is false,
// set it true to count all repositories.
func CountRepositories(private bool) int64 {
return countRepositories(-1, private)
}
// CountPublicRepositories returns number of public repositories.
func CountPublicRepositories() int64 {
return countRepositories(false)
// CountUserRepositories returns number of repositories user owns.
// Argument private only takes effect when it is false,
// set it true to count all repositories.
func CountUserRepositories(userID int64, private bool) int64 {
return countRepositories(userID, private)
}
func Repositories(page, pageSize int) (_ []*Repository, err error) {
@@ -1448,16 +1455,26 @@ func GetRepositoryByID(id int64) (*Repository, error) {
return getRepositoryByID(x, id)
}
// GetRepositories returns a list of repositories of given user.
func GetRepositories(uid int64, private bool) ([]*Repository, error) {
repos := make([]*Repository, 0, 10)
sess := x.Desc("updated_unix")
// GetUserRepositories returns a list of repositories of given user.
func GetUserRepositories(userID int64, private bool, page, pageSize int) ([]*Repository, error) {
sess := x.Where("owner_id = ?", userID).Desc("updated_unix")
if !private {
sess.Where("is_private=?", false)
sess.And("is_private=?", false)
}
return repos, sess.Find(&repos, &Repository{OwnerID: uid})
if page <= 0 {
page = 1
}
sess.Limit(pageSize, (page-1)*pageSize)
repos := make([]*Repository, 0, pageSize)
return repos, sess.Find(&repos)
}
// GetUserRepositories returns a list of mirror repositories of given user.
func GetUserMirrorRepositories(userID int64) ([]*Repository, error) {
repos := make([]*Repository, 0, 10)
return repos, x.Where("owner_id = ?", userID).And("is_mirror = ?", true).Find(&repos)
}
// GetRecentUpdatedRepositories returns the list of repositories that are recently updated.
@@ -1849,6 +1866,74 @@ func CheckRepoStats() {
// ***** END: Repository.NumForks *****
}
type RepositoryList []*Repository
func (repos RepositoryList) loadAttributes(e Engine) error {
if len(repos) == 0 {
return nil
}
// Load owners.
set := make(map[int64]*User)
for i := range repos {
set[repos[i].OwnerID] = nil
}
userIDs := make([]int64, 0, len(set))
for userID := range set {
userIDs = append(userIDs, userID)
}
users := make([]*User, 0, len(userIDs))
if err := e.Where("id > 0").In("id", userIDs).Find(&users); err != nil {
return fmt.Errorf("find users: %v", err)
}
for i := range users {
set[users[i].ID] = users[i]
}
for i := range repos {
repos[i].Owner = set[repos[i].OwnerID]
}
return nil
}
func (repos RepositoryList) LoadAttributes() error {
return repos.loadAttributes(x)
}
type MirrorRepositoryList []*Repository
func (repos MirrorRepositoryList) loadAttributes(e Engine) error {
if len(repos) == 0 {
return nil
}
// Load mirrors.
repoIDs := make([]int64, 0, len(repos))
for i := range repos {
if !repos[i].IsMirror {
continue
}
repoIDs = append(repoIDs, repos[i].ID)
}
mirrors := make([]*Mirror, 0, len(repoIDs))
if err := e.Where("id > 0").In("repo_id", repoIDs).Find(&mirrors); err != nil {
return fmt.Errorf("find mirrors: %v", err)
}
set := make(map[int64]*Mirror)
for i := range mirrors {
set[mirrors[i].RepoID] = mirrors[i]
}
for i := range repos {
repos[i].Mirror = set[repos[i].ID]
}
return nil
}
func (repos MirrorRepositoryList) LoadAttributes() error {
return repos.loadAttributes(x)
}
// __ __ __ .__
// / \ / \_____ _/ |_ ____ | |__
// \ \/\/ /\__ \\ __\/ ___\| | \
@@ -1863,40 +1948,40 @@ type Watch struct {
RepoID int64 `xorm:"UNIQUE(watch)"`
}
func isWatching(e Engine, uid, repoId int64) bool {
has, _ := e.Get(&Watch{0, uid, repoId})
func isWatching(e Engine, userID, repoID int64) bool {
has, _ := e.Get(&Watch{0, userID, repoID})
return has
}
// IsWatching checks if user has watched given repository.
func IsWatching(uid, repoId int64) bool {
return isWatching(x, uid, repoId)
func IsWatching(userID, repoID int64) bool {
return isWatching(x, userID, repoID)
}
func watchRepo(e Engine, uid, repoId int64, watch bool) (err error) {
func watchRepo(e Engine, userID, repoID int64, watch bool) (err error) {
if watch {
if isWatching(e, uid, repoId) {
if isWatching(e, userID, repoID) {
return nil
}
if _, err = e.Insert(&Watch{RepoID: repoId, UserID: uid}); err != nil {
if _, err = e.Insert(&Watch{RepoID: repoID, UserID: userID}); err != nil {
return err
}
_, err = e.Exec("UPDATE `repository` SET num_watches = num_watches + 1 WHERE id = ?", repoId)
_, err = e.Exec("UPDATE `repository` SET num_watches = num_watches + 1 WHERE id = ?", repoID)
} else {
if !isWatching(e, uid, repoId) {
if !isWatching(e, userID, repoID) {
return nil
}
if _, err = e.Delete(&Watch{0, uid, repoId}); err != nil {
if _, err = e.Delete(&Watch{0, userID, repoID}); err != nil {
return err
}
_, err = e.Exec("UPDATE `repository` SET num_watches=num_watches-1 WHERE id=?", repoId)
_, err = e.Exec("UPDATE `repository` SET num_watches = num_watches - 1 WHERE id = ?", repoID)
}
return err
}
// Watch or unwatch repository.
func WatchRepo(uid, repoId int64, watch bool) (err error) {
return watchRepo(x, uid, repoId, watch)
func WatchRepo(userID, repoID int64, watch bool) (err error) {
return watchRepo(x, userID, repoID, watch)
}
func getWatchers(e Engine, repoID int64) ([]*Watch, error) {
@@ -1967,34 +2052,34 @@ type Star struct {
}
// Star or unstar repository.
func StarRepo(uid, repoId int64, star bool) (err error) {
func StarRepo(userID, repoID int64, star bool) (err error) {
if star {
if IsStaring(uid, repoId) {
if IsStaring(userID, repoID) {
return nil
}
if _, err = x.Insert(&Star{UID: uid, RepoID: repoId}); err != nil {
if _, err = x.Insert(&Star{UID: userID, RepoID: repoID}); err != nil {
return err
} else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars + 1 WHERE id = ?", repoId); err != nil {
} else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars + 1 WHERE id = ?", repoID); err != nil {
return err
}
_, err = x.Exec("UPDATE `user` SET num_stars = num_stars + 1 WHERE id = ?", uid)
_, err = x.Exec("UPDATE `user` SET num_stars = num_stars + 1 WHERE id = ?", userID)
} else {
if !IsStaring(uid, repoId) {
if !IsStaring(userID, repoID) {
return nil
}
if _, err = x.Delete(&Star{0, uid, repoId}); err != nil {
if _, err = x.Delete(&Star{0, userID, repoID}); err != nil {
return err
} else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars - 1 WHERE id = ?", repoId); err != nil {
} else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars - 1 WHERE id = ?", repoID); err != nil {
return err
}
_, err = x.Exec("UPDATE `user` SET num_stars = num_stars - 1 WHERE id = ?", uid)
_, err = x.Exec("UPDATE `user` SET num_stars = num_stars - 1 WHERE id = ?", userID)
}
return err
}
// IsStaring checks if user has starred given repository.
func IsStaring(uid, repoId int64) bool {
has, _ := x.Get(&Star{0, uid, repoId})
func IsStaring(userID, repoID int64) bool {
has, _ := x.Get(&Star{0, userID, repoID})
return has
}
+8 -3
View File
@@ -402,12 +402,17 @@ func (u *User) GetOrganizationCount() (int64, error) {
return u.getOrganizationCount(x)
}
// GetRepositories returns all repositories that user owns, including private repositories.
func (u *User) GetRepositories() (err error) {
u.Repos, err = GetRepositories(u.ID, true)
// GetRepositories returns repositories that user owns, including private repositories.
func (u *User) GetRepositories(page, pageSize int) (err error) {
u.Repos, err = GetUserRepositories(u.ID, true, page, pageSize)
return err
}
// GetRepositories returns mirror repositories that user owns, including private repositories.
func (u *User) GetMirrorRepositories() ([]*Repository, error) {
return GetUserMirrorRepositories(u.ID)
}
// GetOwnedOrganizations returns all organizations that user owns.
func (u *User) GetOwnedOrganizations() (err error) {
u.OwnedOrgs, err = GetOwnedOrgsByUserID(u.ID)
+3 -3
View File
@@ -301,7 +301,7 @@ func confAppIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/app.ini", size: 11835, mode: os.FileMode(420), modTime: time.Unix(1469290290, 0)}
info := bindataFileInfo{name: "conf/app.ini", size: 11835, mode: os.FileMode(420), modTime: time.Unix(1469299942, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -4346,7 +4346,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
return a, nil
}
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xeb\x72\xdc\x48\xae\x27\xfe\x9d\x4f\xc1\xf6\x84\xc3\x76\x84\x54\x1d\x3d\x7d\xfe\xff\xdd\xe8\x68\xbb\x57\x96\xda\x97\x73\x2c\x4b\x47\x92\xbb\x77\xb6\xc3\xc1\x66\x15\xa9\x2a\x8e\xab\xc8\x1a\x92\x25\x59\x33\x31\x6f\xb0\x0f\xb0\xcf\xb7\x4f\xb2\xc0\x0f\x40\x5e\x48\x96\x64\xf7\x1c\x7f\xb0\x58\x99\xc8\x1b\x12\x89\x04\x90\x48\x64\xbe\xdd\x66\x45\xd9\x2d\xd2\xe7\xe9\x51\xba\xcd\xab\x7a\x5d\x76\x5d\xda\x95\xeb\xeb\xc3\x55\xd3\xf5\x65\x91\xbe\xae\x7a\xfa\xdd\xde\x54\x8b\x32\x49\x56\xcd\xa6\x24\xd0\x37\xf4\x27\x29\xf2\x6e\x35\x6f\xf2\xb6\xa0\x84\x13\xfb\x4e\xca\xcf\xdb\x75\xd3\x32\xd0\xcf\xf2\x95\xac\xca\xf5\x96\xcb\xd0\x9f\xa4\xab\x96\x75\x56\xd5\xf4\xf3\x92\xbe\xd2\xb7\xb5\xa4\x34\xbb\xde\x92\xce\x76\xbd\xa4\xed\xb6\x96\xf4\x61\x9b\xb4\xe5\xb2\xa2\xde\xb4\x94\x74\xa1\x9f\xc9\x6d\x39\xef\xaa\x9e\x5b\xfa\x55\xbe\x92\x9b\xb2\xed\xaa\x86\x6b\xff\x45\xbe\x92\x6d\xbe\x64\x80\x73\xfa\x93\xf4\xe5\x66\xbb\xce\x51\xe0\x4a\x3f\x93\x75\x5e\x2f\x77\x02\xf3\x4e\x3f\x93\x45\x5b\x52\x56\x56\x97\xb7\x94\x7a\x8c\x1f\xb3\xd9\x2c\xd9\x11\x12\xb2\x6d\xdb\x5c\x57\xeb\x32\xcb\xeb\x22\xdb\xc8\x30\x3f\x50\x7a\xaa\xe9\x29\xa5\xa7\x9c\x8e\x21\x94\x05\x0d\x35\xcb\x3b\x1d\x07\xe1\x92\x46\x9e\x77\x09\xaa\xaa\xf3\x8d\x95\xe6\xcf\xa4\xdc\xe4\xd5\x9a\xb1\xc6\x7f\xa9\xdf\x5d\x77\xdb\x00\xb5\xe7\xfa\x49\x38\xc8\xfa\xbb\x6d\x09\x14\x1c\x5e\xd1\x57\xb2\xc8\xb7\xfd\x62\x95\x73\x37\xe5\x2b\x21\xa0\x6d\x43\xb8\x68\xda\x3b\xc0\xd9\x8f\xa4\x69\x97\x79\x5d\xfd\x3d\xef\x05\x3f\x67\xc1\xcf\x64\x53\xb5\x6d\xc3\xa8\x3d\xc5\x47\x42\x23\xcf\xb8\x1e\x4a\x79\x4f\x48\x08\x6a\xe1\x9c\x4d\xb5\x6c\x05\x8b\x9c\x79\x8a\x5f\x5c\x8b\xe4\x69\x4d\x92\xe5\x6a\xbb\x6e\xda\x4f\x9a\xfa\x8a\x3f\x07\x55\x52\xe7\x34\x37\xee\x57\x5e\xd3\x7c\x68\xee\x29\x7e\x44\x00\x5d\x92\x17\x1b\xc2\xf0\x36\xaf\x4b\x46\xdd\x11\xff\x22\x7c\xd1\xaf\x24\x5f\x2c\x9a\x5d\xdd\x67\x5d\xd9\xf7\x55\xbd\xe4\x39\x38\x92\xa4\xf4\x52\x93\x92\x20\xcf\xa5\xdd\x35\x3b\x37\xcb\x94\xfe\x17\xfa\x99\x9e\xcb\x4f\xc9\x0b\x0a\x21\xd3\x95\xa4\x26\xfb\xea\xa6\xea\xab\x52\x1a\xb3\x1f\xc9\x76\xb7\x5e\x13\x3e\xff\xb6\x2b\xbb\x9e\xb3\xce\xe9\x37\x61\x40\x7e\x27\x55\xd7\xed\x50\xe2\x2d\x3e\x12\x9a\xd4\x7a\x81\xe1\x1c\xe3\x23\x49\x7e\xab\xea\xae\xcf\xd7\xeb\x8f\x89\x7e\x30\xb0\x7c\x09\x9e\xfa\xaa\x47\x67\x35\x31\xbd\xec\xcb\x6d\xc7\x88\x4e\x5f\x55\x6d\xd7\x1f\xf6\x15\x91\xda\xc5\xae\x4e\x8a\x66\xf1\x89\x88\x98\x17\x24\x96\xd2\xdb\xeb\x94\xc6\xf4\x84\xc8\xb8\xdd\xd5\x35\x8d\x22\x7d\xdd\xd0\xc8\xa8\x99\xaa\x28\xd3\x13\x40\x1f\xa4\xdb\x75\x99\x77\x04\x52\xe6\x45\xfa\x63\x9e\xf6\x79\xbb\x2c\xfb\xe7\x8f\xb2\x39\x2d\x9e\x4f\x8f\xd2\x55\x5b\x5e\x3f\x7f\xf4\xb8\x7b\xf4\xe2\xf5\x8e\x8a\xad\xab\xba\xec\x7e\xfc\x36\x7f\x91\x2e\x72\xca\xa1\xb1\xde\xa5\xf3\xf2\x9a\xd7\x0a\xb5\x95\x12\x91\xd6\x4b\x5e\x27\x77\xfd\x8a\x1b\xa4\x09\xa3\x8f\x2e\xe5\x85\xfa\x4d\xc2\x58\xa2\x85\x9c\x15\x73\x63\x4a\xe8\x10\x92\x5b\xc2\xd2\xe9\xdd\xe5\x7f\xbe\x3b\x48\xcf\x89\x33\x2d\xdb\x12\xdf\xf4\x1f\x95\xf8\x3e\xa5\xd1\x5e\x55\x27\x2f\x67\x09\x95\x35\x84\x9c\xe4\x7d\x3e\xe7\xbe\xbb\x49\xe2\x4c\x59\x43\x2e\x0f\x2b\x89\x79\x1d\xf8\x5a\xd7\x63\x75\xea\xca\x9c\x5c\x87\x54\x87\x2e\x5e\x57\xc7\x7b\x5e\xc1\x94\xee\x30\x7b\x2e\x38\xa3\xaa\xd2\xb7\xef\xdf\x9f\x9d\xbc\x4c\xcb\x7a\x49\x98\x49\x6f\xab\x7e\x95\xee\xfa\xeb\xff\x9e\x2d\xcb\xba\x6c\xf3\x75\xb6\xa8\x18\x29\x2d\xd1\x55\x4a\x58\x92\x21\xce\x92\xae\x5b\x13\x83\x29\xb8\x95\xcb\xcb\x77\xe9\x29\x7d\x52\x67\xa8\x2c\x77\xa4\x5f\x25\xdd\xdf\xd6\x8c\x28\xd7\xe0\xd5\xaa\x4c\x41\xb3\x00\x6a\xae\x87\x78\x49\x0b\xed\xeb\x2c\xfd\x71\xde\xbe\x08\xfa\x97\xcf\xbb\x66\xbd\xeb\xb5\xe4\xed\xaa\xac\x31\x51\x44\x4a\x6d\x4f\xdc\xca\x78\xff\x2c\x29\xdb\x36\x23\xbe\xd9\xdf\xf1\xf4\x68\x5f\xf6\xb5\x22\x95\x11\x29\xd7\x4d\x4f\xd3\x9f\xa2\x9c\x54\x51\xd5\x37\xf9\xba\x2a\x68\x92\x3c\x22\xe3\xb2\x48\x2c\x1a\x9a\x6f\x2e\x4d\x14\xdd\xdc\x02\x45\xb4\xc0\x88\xad\xa7\x8f\x66\x8f\xc0\x67\x1f\x1d\x3e\x9a\x25\x75\x93\x09\x13\x60\x8e\x5c\x54\x5d\x3e\x27\xee\x2c\xbb\x45\x6b\xcc\xee\x2f\x4c\x77\xd2\x15\x85\x48\x23\x08\x9e\x13\xde\x81\xc0\xf8\x99\x28\x73\x62\xd3\xe0\x25\xca\x45\xc2\xb1\x1b\xcb\x71\x74\x21\x5c\xc7\x25\x8c\xc6\x9c\xd8\x44\x1b\x55\x1e\x6d\xb7\xeb\x6a\x21\x4d\xbf\x96\x3c\x4f\xa0\xbc\x1f\x2b\x52\x42\x38\x10\x98\xe5\x05\x64\x46\xbd\x66\xae\x94\x46\xec\x1d\xe5\x57\x25\xad\xb8\xd5\x6e\x29\x7b\xd2\xba\xd9\x15\xdf\x60\x73\xb0\x99\xf3\x2c\x38\xbd\x68\xa8\xc3\xa0\x2a\x07\xe0\x9b\x38\x22\x86\xc2\x22\x40\x5b\x6e\x9a\x9e\x11\xa7\xc5\x98\xcd\xdd\x56\x94\x49\x23\xed\xf2\x1b\xda\xdc\xfa\x46\x96\x72\x41\x4b\x75\xc1\x15\xcf\x12\x62\x2b\x99\x2e\x27\xe2\x3f\xb2\xa4\x2c\x2d\xa6\x5d\x40\x6d\x76\xb4\x0a\x57\x54\x19\x23\x9e\xe5\x10\xaa\x72\xaa\x9f\x18\x12\xd5\x03\xee\x40\x2b\xbe\xa1\x3d\x93\x27\xfa\x04\x1f\xfa\x3b\xac\x9f\x7a\x95\x5f\x5f\x53\xaf\x3a\x5a\x4d\x6f\xd2\xc5\xba\xa1\xa5\xf8\xe1\xe2\x5d\xc7\x0b\x6d\x95\x6d\x9b\x16\xf2\x07\x65\x9d\xd3\xa7\x4b\x0b\x10\xcd\x10\xf5\x6e\x33\xa7\x5f\xb7\xab\x6a\xb1\x12\xb4\x73\x09\x5e\x1f\x94\x4a\x4d\xec\x3a\x9a\xc2\x83\x94\x96\x16\x8d\x80\x5Line truncated
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xeb\x72\xdc\x48\xae\x27\xfe\x9d\x4f\xc1\xf6\x84\xc3\x76\x84\x54\x1d\x3d\x7d\xfe\xff\xdd\xe8\x68\xbb\x57\x96\xda\x97\x73\x2c\x4b\x47\x92\xbb\x77\xb6\xc3\xc1\x66\x15\xa9\x2a\x8e\xab\xc8\x1a\x92\x25\x59\x33\x31\x6f\xb0\x0f\xb0\xcf\xb7\x4f\xb2\xc0\x0f\x40\x5e\x48\x96\x64\xf7\x1c\x7f\xb0\x58\x99\xc8\x1b\x12\x89\x04\x90\x48\x64\xbe\xdd\x66\x45\xd9\x2d\xd2\xe7\xe9\x51\xba\xcd\xab\x7a\x5d\x76\x5d\xda\x95\xeb\xeb\xc3\x55\xd3\xf5\x65\x91\xbe\xae\x7a\xfa\xdd\xde\x54\x8b\x32\x49\x56\xcd\xa6\x24\xd0\x37\xf4\x27\x29\xf2\x6e\x35\x6f\xf2\xb6\xa0\x84\x13\xfb\x4e\xca\xcf\xdb\x75\xd3\x32\xd0\xcf\xf2\x95\xac\xca\xf5\x96\xcb\xd0\x9f\xa4\xab\x96\x75\x56\xd5\xf4\xf3\x92\xbe\xd2\xb7\xb5\xa4\x34\xbb\xde\x92\xce\x76\xbd\xa4\xed\xb6\x96\xf4\x61\x9b\xb4\xe5\xb2\xa2\xde\xb4\x94\x74\xa1\x9f\xc9\x6d\x39\xef\xaa\x9e\x5b\xfa\x55\xbe\x92\x9b\xb2\xed\xaa\x86\x6b\xff\x45\xbe\x92\x6d\xbe\x64\x80\x73\xfa\x93\xf4\xe5\x66\xbb\xce\x51\xe0\x4a\x3f\x93\x75\x5e\x2f\x77\x02\xf3\x4e\x3f\x93\x45\x5b\x52\x56\x56\x97\xb7\x94\x7a\x8c\x1f\xb3\xd9\x2c\xd9\x11\x12\xb2\x6d\xdb\x5c\x57\xeb\x32\xcb\xeb\x22\xdb\xc8\x30\x3f\x50\x7a\xaa\xe9\x29\xa5\xa7\x9c\x8e\x21\x94\x05\x0d\x35\xcb\x3b\x1d\x07\xe1\x92\x46\x9e\x77\x09\xaa\xaa\xf3\x8d\x95\xe6\xcf\xa4\xdc\xe4\xd5\x9a\xb1\xc6\x7f\xa9\xdf\x5d\x77\xdb\x00\xb5\xe7\xfa\x49\x38\xc8\xfa\xbb\x6d\x09\x14\x1c\x5e\xd1\x57\xb2\xc8\xb7\xfd\x62\x95\x73\x37\xe5\x2b\x21\xa0\x6d\x43\xb8\x68\xda\x3b\xc0\xd9\x8f\xa4\x69\x97\x79\x5d\xfd\x3d\xef\x05\x3f\x67\xc1\xcf\x64\x53\xb5\x6d\xc3\xa8\x3d\xc5\x47\x42\x23\xcf\xb8\x1e\x4a\x79\x4f\x48\x08\x6a\xe1\x9c\x4d\xb5\x6c\x05\x8b\x9c\x79\x8a\x5f\x5c\x8b\xe4\x69\x4d\x92\xe5\x6a\xbb\x6e\xda\x4f\x9a\xfa\x8a\x3f\x07\x55\x52\xe7\x34\x37\xee\x57\x5e\xd3\x7c\x68\xee\x29\x7e\x44\x00\x5d\x92\x17\x1b\xc2\xf0\x36\xaf\x4b\x46\xdd\x11\xff\x22\x7c\xd1\xaf\x24\x5f\x2c\x9a\x5d\xdd\x67\x5d\xd9\xf7\x55\xbd\xe4\x39\x38\x92\xa4\xf4\x52\x93\x92\x20\xcf\xa5\xdd\x35\x3b\x37\xcb\x94\xfe\x17\xfa\x99\x9e\xcb\x4f\xc9\x0b\x0a\x21\xd3\x95\xa4\x26\xfb\xea\xa6\xea\xab\x52\x1a\xb3\x1f\xc9\x76\xb7\x5e\x13\x3e\xff\xb6\x2b\xbb\x9e\xb3\xce\xe9\x37\x61\x40\x7e\x27\x55\xd7\xed\x50\xe2\x2d\x3e\x12\x9a\xd4\x7a\x81\xe1\x1c\xe3\x23\x49\x7e\xab\xea\xae\xcf\xd7\xeb\x8f\x89\x7e\x30\xb0\x7c\x09\x9e\xfa\xaa\x47\x67\x35\x31\xbd\xec\xcb\x6d\xc7\x88\x4e\x5f\x55\x6d\xd7\x1f\xf6\x15\x91\xda\xc5\xae\x4e\x8a\x66\xf1\x89\x88\x98\x17\x24\x96\xd2\xdb\xeb\x94\xc6\xf4\x84\xc8\xb8\xdd\xd5\x35\x8d\x22\x7d\xdd\xd0\xc8\xa8\x99\xaa\x28\xd3\x13\x40\x1f\xa4\xdb\x75\x99\x77\x04\x52\xe6\x45\xfa\x63\x9e\xf6\x79\xbb\x2c\xfb\xe7\x8f\xb2\x39\x2d\x9e\x4f\x8f\xd2\x55\x5b\x5e\x3f\x7f\xf4\xb8\x7b\xf4\xe2\xf5\x8e\x8a\xad\xab\xba\xec\x7e\xfc\x36\x7f\x91\x2e\x72\xca\xa1\xb1\xde\xa5\xf3\xf2\x9a\xd7\x0a\xb5\x95\x12\x91\xd6\x4b\x5e\x27\x77\xfd\x8a\x1b\xa4\x09\xa3\x8f\x2e\xe5\x85\xfa\x4d\xc2\x58\xa2\x85\x9c\x15\x73\x63\x4a\xe8\x10\x92\x5b\xc2\xd2\xe9\xdd\xe5\x7f\xbe\x3b\x48\xcf\x89\x33\x2d\xdb\x12\xdf\xf4\x1f\x95\xf8\x3e\xa5\xd1\x5e\x55\x27\x2f\x67\x09\x95\x35\x84\x9c\xe4\x7d\x3e\xe7\xbe\xbb\x49\xe2\x4c\x59\x43\x2e\x0f\x2b\x89\x79\x1d\xf8\x5a\xd7\x63\x75\xea\xca\x9c\x5c\x87\x54\x87\x2e\x5e\x57\xc7\x7b\x5e\xc1\x94\xee\x30\x7b\x2e\x38\xa3\xaa\xd2\xb7\xef\xdf\x9f\x9d\xbc\x4c\xcb\x7a\x49\x98\x49\x6f\xab\x7e\x95\xee\xfa\xeb\xff\x9e\x2d\xcb\xba\x6c\xf3\x75\xb6\xa8\x18\x29\x2d\xd1\x55\x4a\x58\x92\x21\xce\x92\xae\x5b\x13\x83\x29\xb8\x95\xcb\xcb\x77\xe9\x29\x7d\x52\x67\xa8\x2c\x77\xa4\x5f\x25\xdd\xdf\xd6\x8c\x28\xd7\xe0\xd5\xaa\x4c\x41\xb3\x00\x6a\xae\x87\x78\x49\x0b\xed\xeb\x2c\xfd\x71\xde\xbe\x08\xfa\x97\xcf\xbb\x66\xbd\xeb\xb5\xe4\xed\xaa\xac\x31\x51\x44\x4a\x6d\x4f\xdc\xca\x78\xff\x2c\x29\xdb\x36\x23\xbe\xd9\xdf\xf1\xf4\x68\x5f\xf6\xb5\x22\x95\x11\x29\xd7\x4d\x4f\xd3\x9f\xa2\x9c\x54\x51\xd5\x37\xf9\xba\x2a\x68\x92\x3c\x22\xe3\xb2\x48\x2c\x1a\x9a\x6f\x2e\x4d\x14\xdd\xdc\x02\x45\xb4\xc0\x88\xad\xa7\x8f\x66\x8f\xc0\x67\x1f\x1d\x3e\x9a\x25\x75\x93\x09\x13\x60\x8e\x5c\x54\x5d\x3e\x27\xee\x2c\xbb\x45\x6b\xcc\xee\x2f\x4c\x77\xd2\x15\x85\x48\x23\x08\x9e\x13\xde\x81\xc0\xf8\x99\x28\x73\x62\xd3\xe0\x25\xca\x45\xc2\xb1\x1b\xcb\x71\x74\x21\x5c\xc7\x25\x8c\xc6\x9c\xd8\x44\x1b\x55\x1e\x6d\xb7\xeb\x6a\x21\x4d\xbf\x96\x3c\x4f\xa0\xbc\x1f\x2b\x52\x42\x38\x10\x98\xe5\x05\x64\x46\xbd\x66\xae\x94\x46\xec\x1d\xe5\x57\x25\xad\xb8\xd5\x6e\x29\x7b\xd2\xba\xd9\x15\xdf\x60\x73\xb0\x99\xf3\x2c\x38\xbd\x68\xa8\xc3\xa0\x2a\x07\xe0\x9b\x38\x22\x86\xc2\x22\x40\x5b\x6e\x9a\x9e\x11\xa7\xc5\x98\xcd\xdd\x56\x94\x49\x23\xed\xf2\x1b\xda\xdc\xfa\x46\x96\x72\x41\x4b\x75\xc1\x15\xcf\x12\x62\x2b\x99\x2e\x27\xe2\x3f\xb2\xa4\x2c\x2d\xa6\x5d\x40\x6d\x76\xb4\x0a\x57\x54\x19\x23\x9e\xe5\x10\xaa\x72\xaa\x9f\x18\x12\xd5\x03\xee\x40\x2b\xbe\xa1\x3d\x93\x27\xfa\x04\x1f\xfa\x3b\xac\x9f\x7a\x95\x5f\x5f\x53\xaf\x3a\x5a\x4d\x6f\xd2\xc5\xba\xa1\xa5\xf8\xe1\xe2\x5d\xc7\x0b\x6d\x95\x6d\x9b\x16\xf2\x07\x65\x9d\xd3\xa7\x4b\x0b\x10\xcd\x10\xf5\x6e\x33\xa7\x5f\xb7\xab\x6a\xb1\x12\xb4\x73\x09\x5e\x1f\x94\x4a\x4d\xec\x3a\x9a\xc2\x83\x94\x96\x16\x8d\x80\x5Line truncated
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
return bindataRead(
@@ -4361,7 +4361,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 51529, mode: os.FileMode(420), modTime: time.Unix(1469259799, 0)}
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 51573, mode: os.FileMode(420), modTime: time.Unix(1469299469, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
+4 -3
View File
@@ -2563,9 +2563,10 @@ footer .ui.language .menu {
border-radius: 3px;
word-break: break-all;
}
.feeds .list .header {
padding-top: 10px;
padding-bottom: 5px;
.feeds .list .header .ui.label {
margin-top: -4px;
padding: 4px 5px;
font-weight: normal;
}
.feeds .list .header .plus.icon {
margin-top: 5px;
+5 -2
View File
@@ -92,8 +92,11 @@
.list {
.header {
padding-top: 10px;
padding-bottom: 5px;
.ui.label {
margin-top: -4px;
padding: 4px 5px;
font-weight: normal;
}
.plus.icon {
margin-top: 5px;
+1 -1
View File
@@ -78,7 +78,7 @@ func Search(ctx *context.APIContext) {
// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-your-repositories
func ListMyRepos(ctx *context.APIContext) {
ownRepos, err := models.GetRepositories(ctx.User.ID, true)
ownRepos, err := models.GetUserRepositories(ctx.User.ID, true, 1, ctx.User.NumRepos)
if err != nil {
ctx.Error(500, "GetRepositories", err)
return
+4 -4
View File
@@ -45,7 +45,7 @@ func Home(ctx *context.Context) {
}
type RepoSearchOptions struct {
Counter func() int64
Counter func(bool) int64
Ranger func(int, int) ([]*models.Repository, error)
Private bool
PageSize int
@@ -55,7 +55,7 @@ type RepoSearchOptions struct {
func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
page := ctx.QueryInt("page")
if page <= 1 {
if page <= 0 {
page = 1
}
@@ -72,7 +72,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
ctx.Handle(500, "opts.Ranger", err)
return
}
count = opts.Counter()
count = opts.Counter(opts.Private)
} else {
repos, count, err = models.SearchRepositoryByName(&models.SearchRepoOptions{
Keyword: keyword,
@@ -107,7 +107,7 @@ func ExploreRepos(ctx *context.Context) {
ctx.Data["PageIsExploreRepositories"] = true
RenderRepoSearch(ctx, &RepoSearchOptions{
Counter: models.CountPublicRepositories,
Counter: models.CountRepositories,
Ranger: models.GetRecentUpdatedRepositories,
PageSize: setting.UI.ExplorePagingNum,
OrderBy: "updated_unix DESC",
+55 -46
View File
@@ -55,8 +55,8 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
// retrieveFeeds loads feeds from database by given context user.
// The user could be organization so it is not always the logged in user,
// which is why we have to explicitly pass the context user ID.
func retrieveFeeds(ctx *context.Context, ctxUserID, userID, offset int64, isProfile bool) {
actions, err := models.GetFeeds(ctxUserID, userID, offset, isProfile)
func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset int64, isProfile bool) {
actions, err := models.GetFeeds(ctxUser, userID, offset, isProfile)
if err != nil {
ctx.Handle(500, "GetFeeds", err)
return
@@ -98,54 +98,55 @@ func Dashboard(ctx *context.Context) {
// Only user can have collaborative repositories.
if !ctxUser.IsOrganization() {
collaborateRepos, err := ctx.User.GetAccessibleRepositories()
collaborateRepos, err := ctx.User.GetAccessibleRepositories(setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetAccessibleRepositories", err)
return
} else if err = models.RepositoryList(collaborateRepos).LoadAttributes(); err != nil {
ctx.Handle(500, "RepositoryList.LoadAttributes", err)
return
}
for i := range collaborateRepos {
if err = collaborateRepos[i].GetOwner(); err != nil {
ctx.Handle(500, "GetOwner: "+collaborateRepos[i].Name, err)
return
}
}
ctx.Data["CollaborateCount"] = len(collaborateRepos)
ctx.Data["CollaborativeRepos"] = collaborateRepos
}
var repos []*models.Repository
var err error
var repos, mirrors []*models.Repository
if ctxUser.IsOrganization() {
if err := ctxUser.GetUserRepositories(ctx.User.ID); err != nil {
repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetUserRepositories", err)
return
}
repos = ctxUser.Repos
} else {
var err error
repos, err = models.GetRepositories(ctxUser.ID, true)
mirrors, err = ctxUser.GetUserMirrorRepositories(ctx.User.ID)
if err != nil {
ctx.Handle(500, "GetUserMirrorRepositories", err)
return
}
} else {
if err = ctxUser.GetRepositories(1, setting.UI.User.RepoPagingNum); err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
repos = ctxUser.Repos
mirrors, err = ctxUser.GetMirrorRepositories()
if err != nil {
ctx.Handle(500, "GetMirrorRepositories", err)
return
}
}
ctx.Data["Repos"] = repos
ctx.Data["MaxShowRepoNum"] = setting.UI.User.RepoPagingNum
// Get mirror repositories.
mirrors := make([]*models.Repository, 0, 5)
for _, repo := range repos {
if repo.IsMirror {
if err := repo.GetMirror(); err != nil {
ctx.Handle(500, "GetMirror: "+repo.Name, err)
return
}
mirrors = append(mirrors, repo)
}
if err := models.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil {
ctx.Handle(500, "MirrorRepositoryList.LoadAttributes", err)
return
}
ctx.Data["MirrorCount"] = len(mirrors)
ctx.Data["Mirrors"] = mirrors
retrieveFeeds(ctx, ctxUser.ID, ctx.User.ID, 0, false)
retrieveFeeds(ctx, ctxUser, ctx.User.ID, 0, false)
if ctx.Written() {
return
}
@@ -198,18 +199,21 @@ func Issues(ctx *context.Context) {
isShowClosed := ctx.Query("state") == "closed"
// Get repositories.
var err error
var repos []*models.Repository
if ctxUser.IsOrganization() {
if err := ctxUser.GetUserRepositories(ctx.User.ID); err != nil {
repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, ctx.User.NumRepos)
if err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
} else {
if err := ctxUser.GetRepositories(); err != nil {
if err := ctxUser.GetRepositories(1, ctx.User.NumRepos); err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
repos = ctxUser.Repos
}
repos := ctxUser.Repos
allCount := 0
repoIDs := make([]int64, 0, len(repos))
@@ -331,29 +335,34 @@ func showOrgProfile(ctx *context.Context) {
org := ctx.Org.Organization
ctx.Data["Title"] = org.FullName
if ctx.IsSigned {
if ctx.User.IsAdmin {
repos, err := models.GetRepositories(org.ID, true)
if err != nil {
ctx.Handle(500, "GetRepositoriesAsAdmin", err)
return
}
ctx.Data["Repos"] = repos
} else {
if err := org.GetUserRepositories(ctx.User.ID); err != nil {
ctx.Handle(500, "GetUserRepositories", err)
return
}
ctx.Data["Repos"] = org.Repos
page := ctx.QueryInt("page")
if page <= 0 {
page = 1
}
var (
repos []*models.Repository
count int64
err error
)
if ctx.IsSigned && !ctx.User.IsAdmin {
repos, count, err = org.GetUserRepositories(ctx.User.ID, page, setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetUserRepositories", err)
return
}
ctx.Data["Repos"] = repos
} else {
repos, err := models.GetRepositories(org.ID, false)
showPrivate := ctx.IsSigned && ctx.User.IsAdmin
repos, err = models.GetUserRepositories(org.ID, showPrivate, page, setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
ctx.Data["Repos"] = repos
count = models.CountUserRepositories(org.ID, showPrivate)
}
ctx.Data["Page"] = paginater.New(int(count), setting.UI.User.RepoPagingNum, page, 5)
if err := org.GetMembers(); err != nil {
ctx.Handle(500, "GetMembers", err)
+16 -9
View File
@@ -9,6 +9,8 @@ import (
"path"
"strings"
"github.com/Unknwon/paginater"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
@@ -55,27 +57,27 @@ func Profile(ctx *context.Context) {
isShowKeys = true
}
u := GetUserByName(ctx, strings.TrimSuffix(uname, ".keys"))
ctxUser := GetUserByName(ctx, strings.TrimSuffix(uname, ".keys"))
if ctx.Written() {
return
}
// Show SSH keys.
if isShowKeys {
ShowSSHKeys(ctx, u.ID)
ShowSSHKeys(ctx, ctxUser.ID)
return
}
if u.IsOrganization() {
if ctxUser.IsOrganization() {
showOrgProfile(ctx)
return
}
ctx.Data["Title"] = u.DisplayName()
ctx.Data["Title"] = ctxUser.DisplayName()
ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = u
ctx.Data["Owner"] = ctxUser
orgs, err := models.GetOrgsByUserID(u.ID, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == u.ID))
orgs, err := models.GetOrgsByUserID(ctxUser.ID, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID))
if err != nil {
ctx.Handle(500, "GetOrgsByUserIDDesc", err)
return
@@ -87,17 +89,22 @@ func Profile(ctx *context.Context) {
ctx.Data["TabName"] = tab
switch tab {
case "activity":
retrieveFeeds(ctx, u.ID, -1, 0, true)
retrieveFeeds(ctx, ctxUser, -1, 0, true)
if ctx.Written() {
return
}
default:
var err error
ctx.Data["Repos"], err = models.GetRepositories(u.ID, ctx.IsSigned && ctx.User.ID == u.ID)
page := ctx.QueryInt("page")
if page <= 0 {
page = 1
}
ctx.Data["Repos"], err = models.GetUserRepositories(ctxUser.ID, ctx.IsSigned && ctx.User.ID == ctxUser.ID, page, setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
ctx.Data["Page"] = paginater.New(ctxUser.NumRepos, setting.UI.User.RepoPagingNum, page, 5)
}
ctx.HTML(200, PROFILE)
+1 -1
View File
@@ -1 +1 @@
0.9.53.0724
0.9.54.0724
+1
View File
@@ -32,6 +32,7 @@
<div class="ui divider"></div>
{{end}}
{{template "explore/repo_list" .}}
{{template "explore/page" .}}
</div>
<div class="ui five wide column">
+6 -1
View File
@@ -37,12 +37,17 @@
</a>
</li>
{{end}}
{{if gt .ContextUser.NumRepos .MaxShowRepoNum}}
<li>
<a href="{{.ContextUser.HomeLink}}">{{.i18n.Tr "home.show_more_repos"}}</a>
</li>
{{end}}
</ul>
</div>
{{if not .ContextUser.IsOrganization}}
<h4 class="ui top attached header">
{{.i18n.Tr "home.collaborative_repos"}} <span class="ui grey label">{{.CollaborateCount}}</span>
{{.i18n.Tr "home.collaborative_repos"}}
</h4>
<div class="ui attached table segment">
<ul id="collaborative-repo-list">
+1
View File
@@ -86,6 +86,7 @@
</div>
{{if ne .TabName "activity"}}
{{template "explore/repo_list" .}}
{{template "explore/page" .}}
{{else}}
<br>
<div class="feeds">