Fix action

This commit is contained in:
Unknown 2014-03-23 06:27:01 -04:00
parent 24630e0c9b
commit 1eb078d0a8
10 changed files with 85 additions and 65 deletions

View file

@ -8,6 +8,7 @@ import (
"encoding/json"
"time"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
)
@ -47,18 +48,17 @@ func (a Action) GetRepoName() string {
return a.RepoName
}
func (a Action) GetBranch() string {
return a.RefName
}
func (a Action) GetContent() string {
return a.Content
}
type PushCommits struct {
Len int
Commits [][]string
}
// CommitRepoAction records action for commit repository.
func CommitRepoAction(userId int64, userName string,
repoId int64, repoName string, refName string, commits *PushCommits) error {
repoId int64, repoName string, refName string, commits *base.PushCommits) error {
bs, err := json.Marshal(commits)
if err != nil {
return err

View file

@ -83,42 +83,42 @@ func GetIssues(userId, repoId, posterId, milestoneId int64, page int, isClosed,
sess := orm.Limit(20, (page-1)*20)
if repoId > 0 {
sess = sess.Where("repo_id=?", repoId).And("is_closed=?", isClosed)
sess.Where("repo_id=?", repoId).And("is_closed=?", isClosed)
} else {
sess = sess.Where("is_closed=?", isClosed)
sess.Where("is_closed=?", isClosed)
}
if userId > 0 {
sess = sess.And("assignee_id=?", userId)
sess.And("assignee_id=?", userId)
} else if posterId > 0 {
sess = sess.And("poster_id=?", posterId)
sess.And("poster_id=?", posterId)
} else if isMention {
sess = sess.And("mentions like '%$" + base.ToStr(userId) + "|%'")
sess.And("mentions like '%$" + base.ToStr(userId) + "|%'")
}
if milestoneId > 0 {
sess = sess.And("milestone_id=?", milestoneId)
sess.And("milestone_id=?", milestoneId)
}
if len(labels) > 0 {
for _, label := range strings.Split(labels, ",") {
sess = sess.And("mentions like '%$" + label + "|%'")
sess.And("mentions like '%$" + label + "|%'")
}
}
switch sortType {
case "oldest":
sess = sess.Asc("created")
sess.Asc("created")
case "recentupdate":
sess = sess.Desc("updated")
sess.Desc("updated")
case "leastupdate":
sess = sess.Asc("updated")
sess.Asc("updated")
case "mostcomment":
sess = sess.Desc("num_comments")
sess.Desc("num_comments")
case "leastcomment":
sess = sess.Asc("num_comments")
sess.Asc("num_comments")
default:
sess = sess.Desc("created")
sess.Desc("created")
}
var issues []Issue