Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Bug fix

Browse source
This commit is contained in:
Unknown 2014-05-07 17:23:02 -04:00
parent 8b6766ecbe
commit e05b1385fb
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
models/issue.go
View file

@ -174,15 +174,15 @@ func NewIssueUserPairs(rid, iid, oid, uid, aid int64) (err error) {
} }
// In case owner is not watching. // In case owner is not watching.
ws = append(ws, &Watch{Uid: id}) ws = append(ws, &Watch{UserId: id})
} }
for _, w := range ws { for _, w := range ws {
if w.Uid == 0 { if w.UserId == 0 {
continue continue
} }
iu.Uid = w.Uid iu.Uid = w.UserId
iu.IsPoster = iu.Uid == uid iu.IsPoster = iu.Uid == uid
iu.IsAssigned = iu.Uid == aid iu.IsAssigned = iu.Uid == aid
if _, err = orm.Insert(iu); err != nil { if _, err = orm.Insert(iu); err != nil {

8
models/repo.go
View file

@ -725,14 +725,14 @@ func GetCollaborators(repoName string) ([]string, error) {
// Watch is connection request for receiving repository notifycation. // Watch is connection request for receiving repository notifycation.
type Watch struct { type Watch struct {
Id int64 Id int64
Uid int64 `xorm:"UNIQUE(watch)"` UserId int64 `xorm:"UNIQUE(watch)"`
RepoId int64 `xorm:"UNIQUE(watch)"` RepoId int64 `xorm:"UNIQUE(watch)"`
} }
// Watch or unwatch repository. // Watch or unwatch repository.
func WatchRepo(uid, rid int64, watch bool) (err error) { func WatchRepo(uid, rid int64, watch bool) (err error) {
if watch { if watch {
if _, err = orm.Insert(&Watch{RepoId: rid, Uid: uid}); err != nil { if _, err = orm.Insert(&Watch{RepoId: rid, UserId: uid}); err != nil {
return err return err
} }
@ -770,12 +770,12 @@ func NotifyWatchers(act *Action) error {
} }
for i := range watches { for i := range watches {
if act.ActUserId == watches[i].Uid { if act.ActUserId == watches[i].UserId {
continue continue
} }
act.Id = 0 act.Id = 0
act.UserId = watches[i].Uid act.UserId = watches[i].UserId
if _, err = orm.InsertOne(act); err != nil { if _, err = orm.InsertOne(act); err != nil {
return errors.New("repo.NotifyWatchers(create action): " + err.Error()) return errors.New("repo.NotifyWatchers(create action): " + err.Error())
} }

2
models/user.go
View file

@ -304,7 +304,7 @@ func DeleteUser(user *User) error {
} }
// Delete all watches. // Delete all watches.
if _, err = orm.Delete(&Watch{Uid: user.Id}); err != nil { if _, err = orm.Delete(&Watch{UserId: user.Id}); err != nil {
return err return err
} }

2
modules/mailer/mail.go
View file

@ -121,7 +121,7 @@ func SendIssueNotifyMail(user, owner *models.User, repo *models.Repository, issu
tos := make([]string, 0, len(ws)) tos := make([]string, 0, len(ws))
for i := range ws { for i := range ws {
uid := ws[i].Uid uid := ws[i].UserId
if user.Id == uid { if user.Id == uid {
continue continue
} }