aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/issue.go19
-rw-r--r--models/repo.go2
-rw-r--r--models/user.go7
3 files changed, 22 insertions, 6 deletions
diff --git a/models/issue.go b/models/issue.go
index 929567b1..fe43a94b 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -58,6 +58,7 @@ func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, co
Content: content,
}
_, err = orm.Insert(issue)
+ // TODO: newIssueAction
return issue, err
}
@@ -67,9 +68,9 @@ func GetIssueCount(repoId int64) (int64, error) {
}
// GetIssueById returns issue object by given id.
-func GetIssueById(id int64) (*Issue, error) {
- issue := new(Issue)
- has, err := orm.Id(id).Get(issue)
+func GetIssueByIndex(repoId, index int64) (*Issue, error) {
+ issue := &Issue{RepoId: repoId, Index: index}
+ has, err := orm.Get(issue)
if err != nil {
return nil, err
} else if !has {
@@ -126,6 +127,18 @@ func GetIssues(userId, repoId, posterId, milestoneId int64, page int, isClosed,
return issues, err
}
+// UpdateIssue updates information of issue.
+func UpdateIssue(issue *Issue) error {
+ _, err := orm.Update(issue, &Issue{RepoId: issue.RepoId, Index: issue.Index})
+ return err
+}
+
+func CloseIssue() {
+}
+
+func ReopenIssue() {
+}
+
// Label represents a list of labels of repository for issues.
type Label struct {
Id int64
diff --git a/models/repo.go b/models/repo.go
index e27e99b0..f03d7683 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -387,7 +387,7 @@ func UpdateRepository(repo *Repository) error {
repo.Website = repo.Website[:255]
}
- _, err := orm.Id(repo.Id).UseBool().Cols("description", "website").Update(repo)
+ _, err := orm.Id(repo.Id).UseBool().Cols("description", "website", "updated").Update(repo)
return err
}
diff --git a/models/user.go b/models/user.go
index 88bbabe6..d2ed5a90 100644
--- a/models/user.go
+++ b/models/user.go
@@ -72,7 +72,10 @@ func (user *User) HomeLink() string {
// AvatarLink returns the user gravatar link.
func (user *User) AvatarLink() string {
- return "/avatar/" + user.Avatar
+ if base.Service.EnableCacheAvatar {
+ return "/avatar/" + user.Avatar
+ }
+ return "http://1.gravatar.com/avatar/" + user.Avatar
}
// NewGitSig generates and returns the signature of given user.
@@ -208,7 +211,7 @@ func UpdateUser(user *User) (err error) {
user.Website = user.Website[:255]
}
- _, err = orm.Id(user.Id).UseBool().Cols("website", "location", "is_active", "is_admin").Update(user)
+ _, err = orm.Id(user.Id).UseBool().Cols("email", "passwd", "avatar", "avatar_email", "website", "location", "is_active", "is_admin", "updated").Update(user)
return err
}