coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1073 #1162 issue ID constraint failed

This commit is contained in:
Unknwon 2015-03-27 06:47:02 -04:00
parent e0036ebb0c
commit 9fb2d49b93
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gopmfile
View File

@ -16,7 +16,7 @@ github.com/gogits/go-gogs-client = commit:92e76d616a
github.com/lib/pq = commit:30ed2200d7 github.com/lib/pq = commit:30ed2200d7
github.com/macaron-contrib/binding = commit:548a793679 github.com/macaron-contrib/binding = commit:548a793679
github.com/macaron-contrib/cache = commit:928d5c35cd github.com/macaron-contrib/cache = commit:928d5c35cd
github.com/macaron-contrib/captcha = commit:fbb8b1ebb5 github.com/macaron-contrib/captcha =
github.com/macaron-contrib/csrf = commit:98ddf5a710 github.com/macaron-contrib/csrf = commit:98ddf5a710
github.com/macaron-contrib/i18n = commit:da2b19e90b github.com/macaron-contrib/i18n = commit:da2b19e90b
github.com/macaron-contrib/oauth2 = commit:8f394c3629 github.com/macaron-contrib/oauth2 = commit:8f394c3629

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.1.0325 Beta" const APP_VER = "0.6.1.0327 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
models/issue.go
View File

@ -282,7 +282,7 @@ type IssueUser struct {
} }
// NewIssueUserPairs adds new issue-user pairs for new issue of repository. // NewIssueUserPairs adds new issue-user pairs for new issue of repository.
func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID int64) (err error) { func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID int64) error {
users, err := repo.GetCollaborators() users, err := repo.GetCollaborators()
if err != nil { if err != nil {
return err return err
@ -295,6 +295,7 @@ func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID in
isNeedAddPoster := true isNeedAddPoster := true
for _, u := range users { for _, u := range users {
iu.Id = 0
iu.Uid = u.Id iu.Uid = u.Id
iu.IsPoster = iu.Uid == posterID iu.IsPoster = iu.Uid == posterID
if isNeedAddPoster && iu.IsPoster { if isNeedAddPoster && iu.IsPoster {
@ -306,6 +307,7 @@ func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID in
} }
} }
if isNeedAddPoster { if isNeedAddPoster {
iu.Id = 0
iu.Uid = posterID iu.Uid = posterID
iu.IsPoster = true iu.IsPoster = true
iu.IsAssigned = iu.Uid == assigneeID iu.IsAssigned = iu.Uid == assigneeID

2
public/css/gogs.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/less/_home.less
View File

@ -1,5 +1,5 @@
.home { .home {
padding-bottom: @footer-margin * 2; padding-bottom: @footer-margin * 3;
.logo { .logo {
max-width: 250px; max-width: 250px;
} }

2
templates/.VERSION
View File

@ -1 +1 @@
0.6.1.0325 Beta 0.6.1.0327 Beta