From 09f817c2c9b6ec00b5d3d9f17a94c222a6e4517a Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Wed, 13 Sep 2017 18:01:44 +0200 Subject: [PATCH 01/25] Hotfix for "Add time manually" (https://github.com/go-gitea/gitea/pull/2211#issuecomment-328780125) Signed-off-by: Jonas Franz --- routers/repo/issue_timetrack.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/issue_timetrack.go b/routers/repo/issue_timetrack.go index e01cd48a6..4d77ca3ce 100644 --- a/routers/repo/issue_timetrack.go +++ b/routers/repo/issue_timetrack.go @@ -41,7 +41,7 @@ func AddTimeManually(c *context.Context, form auth.AddTimeManuallyForm) { return } - if _, err := models.AddTime(c.User, issue, int64(total)); err != nil { + if _, err := models.AddTime(c.User, issue, int64(total.Seconds())); err != nil { c.Handle(http.StatusInternalServerError, "AddTime", err) return } From 05885364473e8efe841ad527b588178f277f27d6 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 26 Aug 2017 18:58:35 +0200 Subject: [PATCH 02/25] Init: * Added models * Added UI * Added Routes Signed-off-by: kolaente --- models/issue_dependency_add.go | 79 +++++++++++++++++++ routers/repo/issue_dependency_add.go | 38 +++++++++ routers/routes/routes.go | 8 +- .../repo/issue/view_content/sidebar.tmpl | 37 +++++++++ 4 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 models/issue_dependency_add.go create mode 100644 routers/repo/issue_dependency_add.go diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go new file mode 100644 index 000000000..04db222ee --- /dev/null +++ b/models/issue_dependency_add.go @@ -0,0 +1,79 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "time" +) + +// IssueDependency is connection request for receiving issue notification. +type IssueDependency struct { + ID int64 `xorm:"pk autoincr"` + UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` + IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` + DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` + Created time.Time `xorm:"-"` + CreatedUnix int64 `xorm:"NOT NULL"` + Updated time.Time `xorm:"-"` + UpdatedUnix int64 `xorm:"NOT NULL"` +} + +// BeforeInsert is invoked from XORM before inserting an object of this type. +func (iw *IssueDependency) BeforeInsert() { + var ( + t = time.Now() + u = t.Unix() + ) + iw.Created = t + iw.CreatedUnix = u + iw.Updated = t + iw.UpdatedUnix = u +} + +// BeforeUpdate is invoked from XORM before updating an object of this type. +func (iw *IssueDependency) BeforeUpdate() { + var ( + t = time.Now() + u = t.Unix() + ) + iw.Updated = t + iw.UpdatedUnix = u +} + +// CreateOrUpdateIssueDependency sets or updates a dependency for an issue +func CreateOrUpdateIssueDependency(userID, issueID int64, dep int64) error { + id, exists, err := getIssueWatch(x, userID, issueID) + if err != nil { + return err + } + + if !exists { + id = &IssueWatch{ + UserID: userID, + IssueID: issueID, + IsWatching: isWatching, + } + + if _, err := x.Insert(iw); err != nil { + return err + } + } else { + iw.IsWatching = isWatching + + if _, err := x.Id(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil { + return err + } + } + return nil +} + +// +func getIssueDep(e Engine, issueID int64) (Dependencies []*IssueDependency, err error) { + id = new(IssueDependency) + err = e. + Where("issue_id = ?", issueID). + Find(&Dependencies) + return +} diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go new file mode 100644 index 000000000..384d04aca --- /dev/null +++ b/routers/repo/issue_dependency_add.go @@ -0,0 +1,38 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "fmt" + "net/http" + "strconv" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" +) + +// IssueWatch sets issue watching +func AddDependency(c *context.Context) { + dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) + if err != nil { + c.Handle(http.StatusInternalServerError, "issue ID is not int", err) + return + } + + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueWatch", err) + return + } + + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a0684c847..888ea2c92 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -485,6 +485,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) + m.Post("/addDependency", repo.AddDependency) m.Group("/times", func() { m.Post("/add", bindIgnErr(auth.AddTimeManuallyForm{}), repo.AddTimeManually) m.Group("/stopwatch", func() { @@ -611,7 +612,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/*", repo.WikiRaw) }, repo.MustEnableWiki, context.CheckUnit(models.UnitTypeWiki), context.CheckUnit(models.UnitTypeWiki)) - m.Get("/archive/*", repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.Download) + m.Get("/archive/*", repo.MustBeNotBare, repo.Download, context.CheckUnit(models.UnitTypeCode)) m.Group("/pulls/:index", func() { m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) @@ -631,11 +632,10 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/src/*", repo.SetEditorconfigIfExists, repo.Home) m.Get("/forks", repo.Forks) }, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) - m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", - repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.RawDiff) + m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.MustBeNotBare, repo.RawDiff, context.CheckUnit(models.UnitTypeCode)) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, - repo.SetDiffViewStyle, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.CompareDiff) + repo.SetDiffViewStyle, repo.MustBeNotBare, repo.CompareDiff, context.CheckUnit(models.UnitTypeCode)) }, ignSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 079c6f52a..4fa89bbdd 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -190,5 +190,42 @@ {{end}} {{end}} + +
+ +
+ Dependencies +
+ This issue currently doesn't have any dependencies. +
+
+ +
+
+ + + + +
+
+ Add new Dependency +
+
+
+
+ +
+
+
+
+
+ Cancel +
+
+ Add + +
From 9ec41580c06efd8a16beca0b2cd04e612d3ec983 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 26 Aug 2017 22:37:52 +0200 Subject: [PATCH 03/25] Added create new issue method Signed-off-by: Konrad --- models/issue_dependency_add.go | 40 ++++++++++--------- public/js/index.js | 11 +++++ routers/repo/issue_dependency_add.go | 5 ++- routers/routes/routes.go | 2 +- .../repo/issue/view_content/sidebar.tmpl | 1 + 5 files changed, 37 insertions(+), 22 deletions(-) diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 04db222ee..5200d57b5 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -6,6 +6,7 @@ package models import ( "time" + "fmt" ) // IssueDependency is connection request for receiving issue notification. @@ -13,7 +14,7 @@ type IssueDependency struct { ID int64 `xorm:"pk autoincr"` UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` - DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` + DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` Created time.Time `xorm:"-"` CreatedUnix int64 `xorm:"NOT NULL"` Updated time.Time `xorm:"-"` @@ -43,37 +44,38 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateOrUpdateIssueDependency sets or updates a dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, dep int64) error { - id, exists, err := getIssueWatch(x, userID, issueID) +func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { + err := x.Sync(new(IssueDependency)) + if err != nil { + return err + } + + exists, err := issueDepExists(x, issueID, depID) if err != nil { return err } if !exists { - id = &IssueWatch{ - UserID: userID, - IssueID: issueID, - IsWatching: isWatching, - } + newId := new(IssueDependency) + newId.UserID = userID + newId.IssueID = issueID + newId.DependencyID = depID - if _, err := x.Insert(iw); err != nil { + if _, err := x.Insert(newId); err != nil { return err } } else { - iw.IsWatching = isWatching - - if _, err := x.Id(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil { - return err - } + fmt.Println("Dependency exists") + // TODO: Should display a message on issue page } return nil } // -func getIssueDep(e Engine, issueID int64) (Dependencies []*IssueDependency, err error) { - id = new(IssueDependency) - err = e. - Where("issue_id = ?", issueID). - Find(&Dependencies) +func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { + var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} + + //err = e.Where("issue_id = ?", issueID).Where("dependency_id = ?", depID).Find(&Dependencies) + exists, err = e.Get(&Dependencies) return } diff --git a/public/js/index.js b/public/js/index.js index cded5e2a1..c808a13de 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1822,3 +1822,14 @@ function toggleStopwatch() { function cancelStopwatch() { $("#cancel_stopwatch_form").submit(); } + +function showAddDependencyModal() { + $('.tiny.modal') + .modal({ + duration: 200, + onApprove: function() { + $('#addDependencyForm').submit(); + } + }).modal('show') + ; +} diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 384d04aca..3ebf20285 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -17,7 +17,7 @@ import ( func AddDependency(c *context.Context) { dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { - c.Handle(http.StatusInternalServerError, "issue ID is not int", err) + c.Handle(http.StatusBadRequest, "issue ID is not int", err) return } @@ -29,7 +29,8 @@ func AddDependency(c *context.Context) { } if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { - c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueWatch", err) + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + fmt.Println("updateerr") return } diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 888ea2c92..a2e6cbcb6 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -484,7 +484,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/title", repo.UpdateIssueTitle) m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) - m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) m.Post("/addDependency", repo.AddDependency) m.Group("/times", func() { m.Post("/add", bindIgnErr(auth.AddTimeManuallyForm{}), repo.AddTimeManually) @@ -499,6 +498,7 @@ func RegisterRoutes(m *macaron.Macaron) { return } }) + m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) }) m.Post("/labels", repo.UpdateIssueLabel, reqRepoWriter) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 4fa89bbdd..7dfb19f08 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -214,6 +214,7 @@
+ {{$.CsrfTokenHtml}}
From b6ecf50342e54de5c5dbc6a36486111a459d8d11 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:23:16 +0200 Subject: [PATCH 04/25] Added basic functionality: * Add new dependecy * Show dependencies Signed-off-by: Konrad --- conf/app.ini | 2 +- models/issue_comment.go | 2 + models/issue_dependency_add.go | 45 ++++++++++----- models/repo.go | 49 ++++++++++++++++ options/locale/locale_en-US.ini | 8 +++ routers/repo/issue.go | 4 ++ routers/repo/issue_dependency_add.go | 8 ++- .../repo/issue/view_content/comments.tmpl | 12 ++++ .../repo/issue/view_content/sidebar.tmpl | 56 ++++++++++++++++--- 9 files changed, 161 insertions(+), 25 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index 9674b815c..b4b2509f2 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -389,7 +389,7 @@ MODE = console ; Buffer length of channel, keep it as it is if you don't know what it is. BUFFER_LEN = 10000 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" -LEVEL = Trace +LEVEL = Debug ; For "console" mode only [log.console] diff --git a/models/issue_comment.go b/models/issue_comment.go index 084a2a81b..a3e54b4fc 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -60,6 +60,8 @@ const ( CommentTypeAddTimeManual // Cancel a stopwatch for time tracking CommentTypeCancelTracking + // Dependency added + CommentTypeAddedDependency ) // CommentTag defines comment tag type diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 5200d57b5..702a0a795 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -6,7 +6,6 @@ package models import ( "time" - "fmt" ) // IssueDependency is connection request for receiving issue notification. @@ -43,18 +42,20 @@ func (iw *IssueDependency) BeforeUpdate() { iw.UpdatedUnix = u } -// CreateOrUpdateIssueDependency sets or updates a dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { - err := x.Sync(new(IssueDependency)) +// CreateOrUpdateIssueDependency creates a new dependency for an issue +func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool) { + err = x.Sync(new(IssueDependency)) if err != nil { - return err + return err, exists } - exists, err := issueDepExists(x, issueID, depID) + // Check if it aleready exists + exists, err = issueDepExists(x, issueID, depID) if err != nil { - return err + return err, exists } + // If it not exists, create it, otherwise show an error message if !exists { newId := new(IssueDependency) newId.UserID = userID @@ -62,20 +63,36 @@ func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { newId.DependencyID = depID if _, err := x.Insert(newId); err != nil { - return err + return err, exists + } + + // Add comment referencing to the stopwatch + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeAddedDependency, + } + + if _, err := x.Insert(comment); err != nil { + return err, exists } - } else { - fmt.Println("Dependency exists") - // TODO: Should display a message on issue page } - return nil + return nil, exists } -// +// Check if the dependency already exists func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} - //err = e.Where("issue_id = ?", issueID).Where("dependency_id = ?", depID).Find(&Dependencies) exists, err = e.Get(&Dependencies) + + // Check for dependencies the other way around + // Otherwise two issues could block each other which would result in none of them could be closed. + if !exists { + Dependencies.IssueID = depID + Dependencies.DependencyID = issueID + exists, err = e.Get(&Dependencies) + } + return } diff --git a/models/repo.go b/models/repo.go index 4b3b0322d..55c82ebfc 100644 --- a/models/repo.go +++ b/models/repo.go @@ -692,6 +692,39 @@ func (repo *Repository) getUsersWithAccessMode(e Engine, mode AccessMode) (_ []* return users, nil } +func (repo *Repository) BlockedByDependencies(issueID int64) (_ []*Issue, err error) { + + issueDeps, err := repo.getBlockedByDependencies(x, issueID) + var issueDepsFull = make([]*Issue, 0) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.DependencyID) + issueDepsFull = append(issueDepsFull, issueDetails) + } + + if err != nil { + return + } + + return issueDepsFull, nil +} + +func (repo *Repository) BlockingDependencies(issueID int64) (_ []*Issue, err error) { + + issueDeps, err := repo.getBlockingDependencies(x, issueID) + var issueDepsFull = make([]*Issue, 0) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.IssueID) + issueDepsFull = append(issueDepsFull, issueDetails) + } + + if err != nil { + return + } + + return issueDepsFull, nil +} // NextIssueIndex returns the next issue index // FIXME: should have a mutex to prevent producing same index for two issues that are created // closely enough. @@ -2425,3 +2458,19 @@ func (repo *Repository) CreateNewBranch(doer *User, oldBranchName, branchName st return nil } + +// Get Blocked By Dependencies, aka all issues this issue is blocked by. +func (repo *Repository) getBlockedByDependencies(e Engine, issueID int64) (_ []IssueDependency, err error) { + var dependencies []IssueDependency + err = e.Where("issue_id = ?", issueID).Find(&dependencies) // + + return dependencies, err +} + +// Get Blocking Dependencies, aka all issues this issue blocks. +func (repo *Repository) getBlockingDependencies(e Engine, issueID int64) (_ []IssueDependency, err error) { + var dependencies []IssueDependency + err = e.Where("dependency_id = ?", issueID).Find(&dependencies) + + return dependencies, err +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2e4520a7a..dc2fc4968 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -725,6 +725,14 @@ issues.add_time_sum_to_small = No time was entered issues.cancel_tracking = Cancel issues.cancel_tracking_history = `cancelled time tracking %s` issues.time_spent_total = Total time spent +issues.dependency.title = Dependencies +issues.dependency.no_dependencies = This issue currently doesn't have any dependencies. +issues.dependency.add = Add +issues.dependency.cancel = Cancel +issues.dependency.add_header = Add New Dependency +issues.dependency.issue_number = Issuenumber +issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` + pulls.desc = Pulls management your code review and merge requests pulls.new = New Pull Request diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 4c4f9037b..3ba669f21 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -707,6 +707,10 @@ func ViewIssue(ctx *context.Context) { ctx.Data["IsPullBranchDeletable"] = canDelete && pull.HeadRepo != nil && git.IsBranchExist(pull.HeadRepo.RepoPath(), pull.HeadBranch) } + // Get Dependencies + ctx.Data["BlockedByDependencies"], err = repo.BlockedByDependencies(issue.ID) + ctx.Data["BlockingDependencies"], err = repo.BlockingDependencies(issue.ID) + ctx.Data["Participants"] = participants ctx.Data["NumParticipants"] = len(participants) ctx.Data["Issue"] = issue diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 3ebf20285..03c4b3db4 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,12 +28,16 @@ func AddDependency(c *context.Context) { return } - if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { + err, exists := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); + if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) - fmt.Println("updateerr") return } + if exists { + c.Flash.Error("Dependency already exists!") + } + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) c.Redirect(url, http.StatusSeeOther) } diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 34609ceb3..804aa1198 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -183,4 +183,16 @@ {{.Poster.Name}} {{$.i18n.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
{{end}} + {{else if eq .Type 16}} +
+ +
+ + + + + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + + {{end}} + {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 7dfb19f08..90b149ced 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -194,13 +194,53 @@
- Dependencies -
- This issue currently doesn't have any dependencies. + {{.i18n.Tr "repo.issues.dependency.title"}} +
+ This issue is blocked by: +
+ {{range .BlockedByDependencies}} +
+
+ {{if .IsClosed}} +
+ +
+ {{else}} +
+ +
+ {{end}} +
+
#{{.Index}}
+ {{.Title}} +
+ {{end}} +
+ +
+ This issue blocks the following issues: + {{range .BlockingDependencies}} +
+
+ {{if .IsClosed}} +
+ +
+ {{else}} +
+ +
+ {{end}} +
+
#{{.Index}}
+ {{.Title}} +
+ {{end}} +

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

@@ -210,22 +250,22 @@
- Add new Dependency + {{.i18n.Tr "repo.issues.dependency.add_header"}}
{{$.CsrfTokenHtml}}
- +
- Cancel + {{.i18n.Tr "repo.issues.dependency.cancel"}}
- Add + {{.i18n.Tr "repo.issues.dependency.add"}}
From 0661b57134048f7a7f04340c5c153a9bd4b432fe Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:32:57 +0200 Subject: [PATCH 05/25] Fixed creating a new dependency when the other issue didn't exists Signed-off-by: Konrad --- models/issue_dependency_add.go | 46 ++++++++++++++++------------ routers/repo/issue_dependency_add.go | 6 +++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 702a0a795..631959f98 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -42,42 +42,48 @@ func (iw *IssueDependency) BeforeUpdate() { iw.UpdatedUnix = u } -// CreateOrUpdateIssueDependency creates a new dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool) { +// CreateIssueDependency creates a new dependency for an issue +func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { - return err, exists + return err, exists, false } // Check if it aleready exists exists, err = issueDepExists(x, issueID, depID) if err != nil { - return err, exists + return err, exists, false } // If it not exists, create it, otherwise show an error message if !exists { - newId := new(IssueDependency) - newId.UserID = userID - newId.IssueID = issueID - newId.DependencyID = depID + // Check if the other issue exists + var issue = Issue{} + issueExists, err := x.Id(depID).Get(&issue) + if issueExists { + newId := new(IssueDependency) + newId.UserID = userID + newId.IssueID = issueID + newId.DependencyID = depID - if _, err := x.Insert(newId); err != nil { - return err, exists - } + if _, err := x.Insert(newId); err != nil { + return err, exists, false + } - // Add comment referencing to the stopwatch - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeAddedDependency, - } + // Add comment referencing the new dependency + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeAddedDependency, + } - if _, err := x.Insert(comment); err != nil { - return err, exists + if _, err := x.Insert(comment); err != nil { + return err, exists, false + } } + return err, exists, true } - return nil, exists + return nil, exists, false } // Check if the dependency already exists diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 03c4b3db4..bf886d3f6 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,12 +28,16 @@ func AddDependency(c *context.Context) { return } - err, exists := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } + if depExists { + c.Flash.Error("Dependend issue does not exist!") + } + if exists { c.Flash.Error("Dependency already exists!") } From 7cc3ff0110c2938ad45ea49782dfe7d9c100e99b Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:45:08 +0200 Subject: [PATCH 06/25] UI improvements Signed-off-by: Konrad --- public/js/index.js | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index c808a13de..d63f052a5 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1824,7 +1824,7 @@ function cancelStopwatch() { } function showAddDependencyModal() { - $('.tiny.modal') + $('.mini.modal') .modal({ duration: 200, onApprove: function() { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 90b149ced..f418cf487 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -196,6 +196,7 @@
{{.i18n.Tr "repo.issues.dependency.title"}}
+ {{if .BlockedByDependencies}} This issue is blocked by:
{{range .BlockedByDependencies}} @@ -216,7 +217,9 @@
{{end}}
+ {{end}} + {{if .BlockingDependencies}}
This issue blocks the following issues: {{range .BlockingDependencies}} @@ -236,8 +239,12 @@ {{.Title}}
{{end}} -

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

+ {{end}} + + {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}} +

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

+ {{end}}
-
+
{{.i18n.Tr "repo.issues.dependency.add_header"}}
From 78e755c812233bded3188660226e3703357fad87 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 21:30:28 +0200 Subject: [PATCH 07/25] Added UI to delete a dependency Signed-off-by: Konrad --- public/js/index.js | 16 ++++++++- .../repo/issue/view_content/sidebar.tmpl | 36 +++++++++++++++++-- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index d63f052a5..92cad8cef 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1824,7 +1824,7 @@ function cancelStopwatch() { } function showAddDependencyModal() { - $('.mini.modal') + $('.add-dependency') .modal({ duration: 200, onApprove: function() { @@ -1833,3 +1833,17 @@ function showAddDependencyModal() { }).modal('show') ; } + +function deleteDependencyModal(id, type) { + $('.remove-dependency') + .modal({ + closable: false, + duration: 200, + onApprove: function() { + $('#removeDependencyID').val(id); + $('#dependencyType').val(type); + $('#removeDependencyForm').submit(); + } + }).modal('show') + ; +} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index f418cf487..ef1f646ce 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -202,6 +202,9 @@ {{range .BlockedByDependencies}}
+ + + {{if .IsClosed}}
@@ -225,8 +228,11 @@ {{range .BlockingDependencies}}
+ + + {{if .IsClosed}} -
+
{{else}} @@ -255,7 +261,7 @@
-
+
{{.i18n.Tr "repo.issues.dependency.add_header"}}
@@ -277,3 +283,29 @@
+ + +
+
+ + Remove Dependency +
+
+
+ {{$.CsrfTokenHtml}} + + +
+

This will remove the dependency to this issue. Are you sure? You cannot undo this!

+
+
+
+ + Cancel +
+
+ + Delete +
+
+
From 6859c47397a7cc7430bee42b4afb3837ccf8e2ce Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 17:10:40 +0200 Subject: [PATCH 08/25] Added delete Dependency function + Improved Event Comments Signed-off-by: Konrad --- conf/app.ini | 2 +- models/issue_comment.go | 2 + ..._dependency_add.go => issue_dependency.go} | 69 +++++++++++++++++++ options/locale/locale_en-US.ini | 1 + routers/repo/issue_dependency_add.go | 2 +- routers/repo/issue_dependency_remove.go | 52 ++++++++++++++ routers/routes/routes.go | 1 + .../repo/issue/view_content/comments.tmpl | 30 +++++++- .../repo/issue/view_content/sidebar.tmpl | 4 +- 9 files changed, 158 insertions(+), 5 deletions(-) rename models/{issue_dependency_add.go => issue_dependency.go} (64%) create mode 100644 routers/repo/issue_dependency_remove.go diff --git a/conf/app.ini b/conf/app.ini index b4b2509f2..9674b815c 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -389,7 +389,7 @@ MODE = console ; Buffer length of channel, keep it as it is if you don't know what it is. BUFFER_LEN = 10000 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" -LEVEL = Debug +LEVEL = Trace ; For "console" mode only [log.console] diff --git a/models/issue_comment.go b/models/issue_comment.go index a3e54b4fc..bc2b86a25 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -62,6 +62,8 @@ const ( CommentTypeCancelTracking // Dependency added CommentTypeAddedDependency + //Dependency removed + CommentTypeRemovedDependency ) // CommentTag defines comment tag type diff --git a/models/issue_dependency_add.go b/models/issue_dependency.go similarity index 64% rename from models/issue_dependency_add.go rename to models/issue_dependency.go index 631959f98..95a4517b4 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency.go @@ -6,6 +6,7 @@ package models import ( "time" + "strconv" ) // IssueDependency is connection request for receiving issue notification. @@ -43,6 +44,7 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue +// TODO: prevent issues having itself as dependency func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { @@ -75,6 +77,17 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist IssueID: issueID, PosterID: userID, Type: CommentTypeAddedDependency, + Content: strconv.FormatInt(depID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err, exists, false + } + comment = &Comment{ + IssueID: depID, + PosterID: userID, + Type: CommentTypeAddedDependency, + Content: strconv.FormatInt(issueID, 10), } if _, err := x.Insert(comment); err != nil { @@ -86,6 +99,62 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist return nil, exists, false } +// Removes a dependency from an issue +func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { + err = x.Sync(new(IssueDependency)) + if err != nil { + return err + } + + // Check if it exists + exists, err := issueDepExists(x, issueID, depID) + if err != nil { + return err + } + + // If it exists, remove it, otherwise show an error message + if exists { + + if depType == 1{ + _, err := x.Delete(&IssueDependency{IssueID: issueID, DependencyID: depID}) + if err != nil { + return err + } + } + + if depType == 2{ + _, err := x.Delete(&IssueDependency{IssueID: depID, DependencyID: issueID}) + if err != nil { + return err + } + } + + // Add comment referencing the removed dependency + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeRemovedDependency, + Content: strconv.FormatInt(depID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err + } + + comment = &Comment{ + IssueID: depID, + PosterID: userID, + Type: CommentTypeRemovedDependency, + Content: strconv.FormatInt(issueID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err + } + } + return nil +} + // Check if the dependency already exists func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dc2fc4968..1f7188f82 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -732,6 +732,7 @@ issues.dependency.cancel = Cancel issues.dependency.add_header = Add New Dependency issues.dependency.issue_number = Issuenumber issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` +issues.dependency.removed_dependency = `%[2]s removed a dependency %[3]s` pulls.desc = Pulls management your code review and merge requests diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index bf886d3f6..ceb672356 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -34,7 +34,7 @@ func AddDependency(c *context.Context) { return } - if depExists { + if !depExists { c.Flash.Error("Dependend issue does not exist!") } diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go new file mode 100644 index 000000000..a12ed63da --- /dev/null +++ b/routers/repo/issue_dependency_remove.go @@ -0,0 +1,52 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "fmt" + "net/http" + "strconv" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" +) + +// IssueWatch sets issue watching +func RemoveDependency(c *context.Context) { + dep, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) + if err != nil { + c.Handle(http.StatusBadRequest, "issue ID is not int", err) + return + } + + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + // Dependency Type + // Types: 1 = blockedBy, 2 = blocking + depType, err := strconv.ParseInt(c.Req.PostForm.Get("dependencyType"), 10, 64) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetDependecyType", err) + return + } + + if depType != 1 && depType != 2{ + c.Handle(http.StatusBadRequest, "GetDependecyType", nil) + return + } + + err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) + if err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + return + } + + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a2e6cbcb6..7dfaffe70 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -485,6 +485,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) m.Post("/addDependency", repo.AddDependency) + m.Post("/removeDependency", repo.RemoveDependency) m.Group("/times", func() { m.Post("/add", bindIgnErr(auth.AddTimeManuallyForm{}), repo.AddTimeManually) m.Group("/stopwatch", func() { diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 804aa1198..1c14e13b2 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -194,5 +194,33 @@ {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} {{end}} - + {{else if eq .Type 17}} +
+ + + + + + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + +
+ + {{.Content}} +
+
+ {{else if eq .Type 18}} +
+ + + + + + {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + +
+ + {{.Content}}  +
+
+ {{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index ef1f646ce..b9ec76f66 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -202,7 +202,7 @@ {{range .BlockedByDependencies}}
- + {{if .IsClosed}} @@ -228,7 +228,7 @@ {{range .BlockingDependencies}}
- + {{if .IsClosed}} From 39f7f92b84ce827692b3bbc9ec04ef57e82d2fdd Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 17:16:54 +0200 Subject: [PATCH 09/25] Added method to prevent making an issue dependent on itself Signed-off-by: Konrad --- models/issue_dependency.go | 1 - routers/repo/issue_dependency_add.go | 26 ++++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 95a4517b4..d59d5b22b 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -44,7 +44,6 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue -// TODO: prevent issues having itself as dependency func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index ceb672356..05f25f850 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,18 +28,24 @@ func AddDependency(c *context.Context) { return } - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); - if err != nil { - c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) - return - } + // Check if issue and dependency is the same + if dep == issueIndex{ + c.Flash.Error("You cannot make an issue depend on itself!") + } else { - if !depExists { - c.Flash.Error("Dependend issue does not exist!") - } + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); + if err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + return + } - if exists { - c.Flash.Error("Dependency already exists!") + if !depExists { + c.Flash.Error("Dependend issue does not exist!") + } + + if exists { + c.Flash.Error("Dependency already exists!") + } } url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) From 475c539feecf148a7bc3e08ceb813a4be7359d24 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 18:26:59 +0200 Subject: [PATCH 10/25] Improved Comments Signed-off-by: Konrad --- models/issue_comment.go | 1 + models/issue_dependency.go | 20 ++++++++++++++----- .../repo/issue/view_content/sidebar.tmpl | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index bc2b86a25..5f2f75dd3 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -96,6 +96,7 @@ type Comment struct { OldAssignee *User `xorm:"-"` OldTitle string NewTitle string + DependentIssue int64 CommitID int64 Line int64 diff --git a/models/issue_dependency.go b/models/issue_dependency.go index d59d5b22b..3379c9d66 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -6,7 +6,6 @@ package models import ( "time" - "strconv" ) // IssueDependency is connection request for receiving issue notification. @@ -76,17 +75,22 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist IssueID: issueID, PosterID: userID, Type: CommentTypeAddedDependency, - Content: strconv.FormatInt(depID, 10), + Content: issue.Title, + DependentIssue: depID, } if _, err := x.Insert(comment); err != nil { return err, exists, false } + + var depIssue = Issue{} + _, err = x.Id(issueID).Get(&depIssue) comment = &Comment{ IssueID: depID, PosterID: userID, Type: CommentTypeAddedDependency, - Content: strconv.FormatInt(issueID, 10), + Content: depIssue.Title, + DependentIssue: issueID, } if _, err := x.Insert(comment); err != nil { @@ -129,22 +133,28 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Add comment referencing the removed dependency + var issue = Issue{} + _, err = x.Id(depID).Get(&issue) comment := &Comment{ IssueID: issueID, PosterID: userID, Type: CommentTypeRemovedDependency, - Content: strconv.FormatInt(depID, 10), + Content: issue.Title, + DependentIssue: depID, } if _, err := x.Insert(comment); err != nil { return err } + var depIssue = Issue{} + _, err = x.Id(issueID).Get(&depIssue) comment = &Comment{ IssueID: depID, PosterID: userID, Type: CommentTypeRemovedDependency, - Content: strconv.FormatInt(issueID, 10), + Content: depIssue.Title, + DependentIssue: issueID, } if _, err := x.Insert(comment); err != nil { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index b9ec76f66..6ea4439a2 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -197,7 +197,7 @@ {{.i18n.Tr "repo.issues.dependency.title"}}
{{if .BlockedByDependencies}} - This issue is blocked by: + Closing this issue is blocked by:
{{range .BlockedByDependencies}}
@@ -224,7 +224,7 @@ {{if .BlockingDependencies}}
- This issue blocks the following issues: + This issue blocks closing of the following issues: {{range .BlockingDependencies}}
From c3a05812432d927d4ba17b89912c0ef99ad6fd68 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 20:28:18 +0200 Subject: [PATCH 11/25] Implemented not closing an issue if it has blocking dependencies Signed-off-by: Konrad --- models/issue_dependency.go | 20 ++++++++++++++++++++ routers/repo/issue.go | 12 ++++++++++++ 2 files changed, 32 insertions(+) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 3379c9d66..29d9741f5 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -180,3 +180,23 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro return } + +// check if issue can be closed +func IssueNoDependenciesLeft(issueID int64) bool{ + + var issueDeps []IssueDependency + err := x.Where("issue_id = ?", issueID).Find(&issueDeps) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.DependencyID) + if !issueDetails.IsClosed { + return false + } + } + + if err != nil { + return false + } + + return true +} diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3ba669f21..2e682b1c3 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -912,6 +912,18 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { (form.Status == "reopen" || form.Status == "close") && !(issue.IsPull && issue.PullRequest.HasMerged) { + // Check for open dependencies + if form.Status == "close"{ + + canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + + if !canbeClosed { + ctx.Flash.Error("You need to close all issues blocking this issue!") + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + return + } + } + // Duplication and conflict check should apply to reopen pull request. var pr *models.PullRequest From 21f36f99c60b77053e76451e4229cc43623bea95 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 20:40:00 +0200 Subject: [PATCH 12/25] Implemented not closing an issue via commit message if it has blocking dependencies Signed-off-by: Konrad --- models/action.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/models/action.go b/models/action.go index 8793a4a24..b1ccfe074 100644 --- a/models/action.go +++ b/models/action.go @@ -472,8 +472,13 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err continue } - if err = issue.ChangeStatus(doer, repo, true); err != nil { - return err + // Check for dependencies, if there aren't any, close it + canbeClosed := IssueNoDependenciesLeft(issue.ID) + + if canbeClosed { + if err = issue.ChangeStatus(doer, repo, true); err != nil { + return err + } } } From 88025f8d7f62d83b1e1c2244a6a4f77b4a50ebec Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 22:32:29 +0200 Subject: [PATCH 13/25] Implemented Dependencies for pull requests. Signed-off-by: Konrad --- routers/repo/issue.go | 9 +++++++-- routers/repo/pull.go | 8 ++++++++ templates/repo/issue/view_content/sidebar.tmpl | 16 ++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 2e682b1c3..46873ddcc 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -918,8 +918,13 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { canbeClosed := models.IssueNoDependenciesLeft(issue.ID) if !canbeClosed { - ctx.Flash.Error("You need to close all issues blocking this issue!") - ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + if issue.IsPull{ + ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") + ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) + } else { + ctx.Flash.Error("You need to close all issues blocking this issue before you can close it!") + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + } return } } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 87d3bdc26..77f178daa 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -428,6 +428,14 @@ func MergePullRequest(ctx *context.Context) { pr.Issue = issue pr.Issue.Repo = ctx.Repo.Repository + canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + + if !canbeClosed { + ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") + ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) + return + } + if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil { ctx.Handle(500, "Merge", err) return diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 6ea4439a2..84a3ee579 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -197,7 +197,13 @@ {{.i18n.Tr "repo.issues.dependency.title"}}
{{if .BlockedByDependencies}} - Closing this issue is blocked by: + + {{if .Issue.IsPull}} + Closing this pull request is blocked by: + {{else}} + Closing this issue is blocked by: + {{end}} +
{{range .BlockedByDependencies}}
@@ -224,7 +230,13 @@ {{if .BlockingDependencies}}
- This issue blocks closing of the following issues: + + {{if .Issue.IsPull}} + This pull request blocks closing of the following issues: + {{else}} + This issue blocks closing of the following issues: + {{end}} + {{range .BlockingDependencies}}
From 88855dd99163e783b6b00f19dae7482a0f5ca1ca Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 3 Sep 2017 19:49:51 +0200 Subject: [PATCH 14/25] Started implementation of setting Signed-off-by: Konrad --- models/unit.go | 2 ++ modules/auth/repo_form.go | 1 + routers/repo/setting.go | 10 ++++++++++ templates/repo/settings/options.tmpl | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/models/unit.go b/models/unit.go index a14edcec0..db15100c5 100644 --- a/models/unit.go +++ b/models/unit.go @@ -16,6 +16,7 @@ const ( UnitTypeWiki // 5 Wiki UnitTypeExternalWiki // 6 ExternalWiki UnitTypeExternalTracker // 7 ExternalTracker + UnitTypeIssueDependencies // 8 Issue Dependencies ) var ( @@ -28,6 +29,7 @@ var ( UnitTypeWiki, UnitTypeExternalWiki, UnitTypeExternalTracker, + UnitTypeIssueDependencies, } // defaultRepoUnits contains the default unit types diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index a6454655f..a226f69a3 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -106,6 +106,7 @@ type RepoSettingForm struct { EnablePulls bool EnableTimetracker bool AllowOnlyContributorsToTrackTime bool + EnableIssueDependencies bool } // Validate validates the fields diff --git a/routers/repo/setting.go b/routers/repo/setting.go index eb4136b07..27fb751f8 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "fmt" ) const ( @@ -219,6 +220,15 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { }) } + if form.EnableIssueDependencies{ + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeIssueDependencies, + Index: int(models.UnitTypeIssueDependencies), + Config: new(models.UnitConfig), + }) + } + if err := models.UpdateRepositoryUnits(repo, units); err != nil { ctx.Handle(500, "UpdateRepositoryUnits", err) return diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index b2b7fc9c3..ec3b8f693 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -153,6 +153,12 @@
+
+
+ + +
+
From ca3b4e388a28348e196fb229e11e8270a8a2f6a1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 3 Sep 2017 21:51:22 +0200 Subject: [PATCH 15/25] Implemented Basic Setting of Issue Dependencies Signed-off-by: Konrad --- models/repo.go | 2 ++ models/repo_unit.go | 2 +- models/unit.go | 9 +++++++++ modules/context/repo.go | 1 + routers/repo/setting.go | 1 - templates/repo/settings/options.tmpl | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/models/repo.go b/models/repo.go index 55c82ebfc..66c34982c 100644 --- a/models/repo.go +++ b/models/repo.go @@ -396,6 +396,7 @@ func (repo *Repository) UnitEnabled(tp UnitType) bool { return true } } + return false } @@ -692,6 +693,7 @@ func (repo *Repository) getUsersWithAccessMode(e Engine, mode AccessMode) (_ []* return users, nil } +// Find all Dependencies an issue is blocked by func (repo *Repository) BlockedByDependencies(issueID int64) (_ []*Issue, err error) { issueDeps, err := repo.getBlockedByDependencies(x, issueID) diff --git a/models/repo_unit.go b/models/repo_unit.go index 1553fa771..fd01aaf60 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -91,7 +91,7 @@ func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { switch colName { case "type": switch UnitType(Cell2Int64(val)) { - case UnitTypeCode, UnitTypePullRequests, UnitTypeReleases, + case UnitTypeCode, UnitTypePullRequests, UnitTypeReleases, UnitTypeIssueDependencies, UnitTypeWiki: r.Config = new(UnitConfig) case UnitTypeExternalWiki: diff --git a/models/unit.go b/models/unit.go index db15100c5..7dc348a58 100644 --- a/models/unit.go +++ b/models/unit.go @@ -120,6 +120,14 @@ var ( 4, } + UnitIssueDependencies = Unit{ + UnitTypeIssueDependencies, + "repo.issue_dependency", + "/issues", + "repo.issue_dependency.desc", + 5, + } + // Units contains all the units Units = map[UnitType]Unit{ UnitTypeCode: UnitCode, @@ -129,5 +137,6 @@ var ( UnitTypeReleases: UnitReleases, UnitTypeWiki: UnitWiki, UnitTypeExternalWiki: UnitExternalWiki, + UnitTypeIssueDependencies: UnitIssueDependencies, } ) diff --git a/modules/context/repo.go b/modules/context/repo.go index a82535a6d..edf95f5f9 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -567,5 +567,6 @@ func UnitTypes() macaron.Handler { ctx.Data["UnitTypeWiki"] = models.UnitTypeWiki ctx.Data["UnitTypeExternalWiki"] = models.UnitTypeExternalWiki ctx.Data["UnitTypeExternalTracker"] = models.UnitTypeExternalTracker + ctx.Data["UnitTypeIssueDependencies"] = models.UnitTypeIssueDependencies } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 27fb751f8..dcba5eb5f 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -16,7 +16,6 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "fmt" ) const ( diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index ec3b8f693..e1a4831d8 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -155,7 +155,7 @@
- +
From 2c95447bdf4456b4805001c2528dbd23386184a4 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 22:30:22 +0200 Subject: [PATCH 16/25] Started implementation of comments Signed-off-by: Konrad --- models/issue_comment.go | 30 ++++++- models/issue_dependency.go | 104 +++++++++++++++--------- routers/repo/issue_dependency_add.go | 4 +- routers/repo/issue_dependency_remove.go | 1 + 4 files changed, 98 insertions(+), 41 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 5f2f75dd3..4a2c3ac41 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -318,8 +318,18 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err Content: opts.Content, OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, + DependentIssue: opts.DependentIssue, } - if _, err = e.Insert(comment); err != nil { + + //fmt.Println(comment) + + // TODO: WHY ISNT THIS INSERTED?????? + // It seems to be inserted, but isnt. (Doesn't return an error, raw pasting + // the sql query in a database console does work). But after the function + // is called, there is no entry in the database. At least for type 12 and 13. + + _, err = e.Insert(comment) + if err != nil { return nil, err } @@ -491,6 +501,23 @@ func createDeleteBranchComment(e *xorm.Session, doer *User, repo *Repository, is }) } +// Creates issue dependency comment +func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dependantIssue int64, added bool) (*Comment, error) { + cType := CommentTypeAddedDependency + if !added { + cType = CommentTypeRemovedDependency + } + + return createComment(e, &CreateCommentOptions{ + Type: cType, + Doer: doer, + Repo: repo, + Issue: issue, + DependentIssue: dependantIssue, + Content: issue.Title, + }) +} + // CreateCommentOptions defines options for creating comment type CreateCommentOptions struct { Type CommentType @@ -510,6 +537,7 @@ type CreateCommentOptions struct { LineNum int64 Content string Attachments []string // UUIDs of attachments + DependentIssue int64 } // CreateComment creates comment of issue or commit. diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 29d9741f5..8ab4a4938 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -44,6 +44,13 @@ func (iw *IssueDependency) BeforeUpdate() { // CreateIssueDependency creates a new dependency for an issue func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err, false, false + } + + // TODO: Move this to the appropriate place err = x.Sync(new(IssueDependency)) if err != nil { return err, exists, false @@ -60,6 +67,7 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Check if the other issue exists var issue = Issue{} issueExists, err := x.Id(depID).Get(&issue) + if issueExists { newId := new(IssueDependency) newId.UserID = userID @@ -70,30 +78,40 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist return err, exists, false } - // Add comment referencing the new dependency - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeAddedDependency, - Content: issue.Title, - DependentIssue: depID, - } - - if _, err := x.Insert(comment); err != nil { + user, err := getUserByID(x, userID) + if err != nil { return err, exists, false } - var depIssue = Issue{} - _, err = x.Id(issueID).Get(&depIssue) - comment = &Comment{ - IssueID: depID, - PosterID: userID, - Type: CommentTypeAddedDependency, - Content: depIssue.Title, - DependentIssue: issueID, + // Add comment referencing the new dependency + + repo, err := getRepositoryByID(x, issue.RepoID) + + if err != nil { + return err, exists, false } - if _, err := x.Insert(comment); err != nil { + + _, err = createIssueDependencyComment(sess, user, repo, &issue, depID, true) + + if err != nil { + return err, exists, false + } + + // Create a new comment for the dependent issue + depIssue, err := getIssueByID(x, issueID) + if err != nil { + return err, exists, false + } + + repo, err = getRepositoryByID(x, depIssue.RepoID) + if err != nil { + return err, exists, false + } + + _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, true) + + if err != nil { return err, exists, false } } @@ -104,6 +122,13 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Removes a dependency from an issue func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err + } + + // TODO: Same as above err = x.Sync(new(IssueDependency)) if err != nil { return err @@ -133,31 +158,34 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Add comment referencing the removed dependency - var issue = Issue{} - _, err = x.Id(depID).Get(&issue) - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeRemovedDependency, - Content: issue.Title, - DependentIssue: depID, - } + issue, err := getIssueByID(x, depID) - if _, err := x.Insert(comment); err != nil { + if err != nil { return err } - var depIssue = Issue{} - _, err = x.Id(issueID).Get(&depIssue) - comment = &Comment{ - IssueID: depID, - PosterID: userID, - Type: CommentTypeRemovedDependency, - Content: depIssue.Title, - DependentIssue: issueID, + user, _ := getUserByID(x, userID) + + repo, _ := getRepositoryByID(x, issue.RepoID) + + _, err = createIssueDependencyComment(sess, user, repo, issue, depID, false) + + if err != nil { + return err } - if _, err := x.Insert(comment); err != nil { + // Create a new comment for the dependent issue + depIssue, err := getIssueByID(x, issueID) + + if err != nil { + return err + } + + repo, _ = getRepositoryByID(x, depIssue.RepoID) + + _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, false) + + if err != nil { return err } } diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 05f25f850..3facf63bd 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/modules/context" ) -// IssueWatch sets issue watching +// Adds new dependencies func AddDependency(c *context.Context) { dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { @@ -33,7 +33,7 @@ func AddDependency(c *context.Context) { c.Flash.Error("You cannot make an issue depend on itself!") } else { - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep) if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go index a12ed63da..7abe925e6 100644 --- a/routers/repo/issue_dependency_remove.go +++ b/routers/repo/issue_dependency_remove.go @@ -43,6 +43,7 @@ func RemoveDependency(c *context.Context) { err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) if err != nil { + panic(err) c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } From 2f9a4cc9e4d411dff12d10f59ff22719eaabd638 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 22:39:37 +0200 Subject: [PATCH 17/25] Fixed comments Signed-off-by: Konrad --- models/issue_dependency.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 8ab4a4938..bd230ffd5 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -45,10 +45,6 @@ func (iw *IssueDependency) BeforeUpdate() { // CreateIssueDependency creates a new dependency for an issue func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err, false, false - } // TODO: Move this to the appropriate place err = x.Sync(new(IssueDependency)) @@ -123,10 +119,6 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Removes a dependency from an issue func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } // TODO: Same as above err = x.Sync(new(IssueDependency)) From 538c3f04f314b4b25e5d2acaa8cd2b59b68ac662 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 23:32:34 +0200 Subject: [PATCH 18/25] Beautify @JonasFranzDEV Signed-off-by: Konrad --- models/issue_comment.go | 10 +- models/issue_dependency.go | 126 ++++++++---------------- routers/repo/issue_dependency_add.go | 13 ++- routers/repo/issue_dependency_remove.go | 12 ++- 4 files changed, 64 insertions(+), 97 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 4a2c3ac41..1ebd775de 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -96,7 +96,8 @@ type Comment struct { OldAssignee *User `xorm:"-"` OldTitle string NewTitle string - DependentIssue int64 + DependentIssueID int64 + DependentIssue *Issue `xorm:"-"` CommitID int64 Line int64 @@ -319,6 +320,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, DependentIssue: opts.DependentIssue, + DependentIssueID: opts.DependentIssue.ID, } //fmt.Println(comment) @@ -502,7 +504,7 @@ func createDeleteBranchComment(e *xorm.Session, doer *User, repo *Repository, is } // Creates issue dependency comment -func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dependantIssue int64, added bool) (*Comment, error) { +func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dependantIssue *Issue, added bool) (*Comment, error) { cType := CommentTypeAddedDependency if !added { cType = CommentTypeRemovedDependency @@ -511,7 +513,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, return createComment(e, &CreateCommentOptions{ Type: cType, Doer: doer, - Repo: repo, + Repo: issue.Repo, Issue: issue, DependentIssue: dependantIssue, Content: issue.Title, @@ -525,6 +527,7 @@ type CreateCommentOptions struct { Repo *Repository Issue *Issue Label *Label + DependentIssue *Issue OldMilestoneID int64 MilestoneID int64 @@ -537,7 +540,6 @@ type CreateCommentOptions struct { LineNum int64 Content string Attachments []string // UUIDs of attachments - DependentIssue int64 } // CreateComment creates comment of issue or commit. diff --git a/models/issue_dependency.go b/models/issue_dependency.go index bd230ffd5..0947f607f 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -10,14 +10,14 @@ import ( // IssueDependency is connection request for receiving issue notification. type IssueDependency struct { - ID int64 `xorm:"pk autoincr"` - UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` - IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` + ID int64 `xorm:"pk autoincr"` + UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` + IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` - Created time.Time `xorm:"-"` - CreatedUnix int64 `xorm:"NOT NULL"` - Updated time.Time `xorm:"-"` - UpdatedUnix int64 `xorm:"NOT NULL"` + Created time.Time `xorm:"-"` + CreatedUnix int64 `xorm:"NOT NULL"` + Updated time.Time `xorm:"-"` + UpdatedUnix int64 `xorm:"NOT NULL"` } // BeforeInsert is invoked from XORM before inserting an object of this type. @@ -43,7 +43,7 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue -func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { +func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists bool, depExists bool) { sess := x.NewSession() // TODO: Move this to the appropriate place @@ -53,71 +53,41 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist } // Check if it aleready exists - exists, err = issueDepExists(x, issueID, depID) + exists, err = issueDepExists(x, issue.ID, dep.ID) if err != nil { return err, exists, false } // If it not exists, create it, otherwise show an error message if !exists { - // Check if the other issue exists - var issue = Issue{} - issueExists, err := x.Id(depID).Get(&issue) + newId := new(IssueDependency) + newId.UserID = user.ID + newId.IssueID = issue.ID + newId.DependencyID = dep.ID - if issueExists { - newId := new(IssueDependency) - newId.UserID = userID - newId.IssueID = issueID - newId.DependencyID = depID - - if _, err := x.Insert(newId); err != nil { - return err, exists, false - } - - user, err := getUserByID(x, userID) - if err != nil { - return err, exists, false - } - - // Add comment referencing the new dependency - - repo, err := getRepositoryByID(x, issue.RepoID) - - if err != nil { - return err, exists, false - } - - - _, err = createIssueDependencyComment(sess, user, repo, &issue, depID, true) - - if err != nil { - return err, exists, false - } - - // Create a new comment for the dependent issue - depIssue, err := getIssueByID(x, issueID) - if err != nil { - return err, exists, false - } - - repo, err = getRepositoryByID(x, depIssue.RepoID) - if err != nil { - return err, exists, false - } - - _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, true) - - if err != nil { - return err, exists, false - } + if _, err := x.Insert(newId); err != nil { + return err, exists, false + } + + // Add comment referencing the new dependency + _, err = createIssueDependencyComment(sess, user, issue, dep, true) + + if err != nil { + return err, exists, false + } + + // Create a new comment for the dependent issue + _, err = createIssueDependencyComment(sess, user, dep, issue, true) + + if err != nil { + return err, exists, false } - return err, exists, true } return nil, exists, false } // Removes a dependency from an issue -func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { +func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType int64) (err error) { sess := x.NewSession() // TODO: Same as above @@ -127,7 +97,7 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Check if it exists - exists, err := issueDepExists(x, issueID, depID) + exists, err := issueDepExists(x, issue.ID, dep.ID) if err != nil { return err } @@ -135,47 +105,29 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e // If it exists, remove it, otherwise show an error message if exists { - if depType == 1{ - _, err := x.Delete(&IssueDependency{IssueID: issueID, DependencyID: depID}) + if depType == 1 { + _, err := x.Delete(&IssueDependency{IssueID: issue.ID, DependencyID: dep.ID}) if err != nil { return err } } - if depType == 2{ - _, err := x.Delete(&IssueDependency{IssueID: depID, DependencyID: issueID}) + if depType == 2 { + _, err := x.Delete(&IssueDependency{IssueID: dep.ID, DependencyID: issue.ID}) if err != nil { return err } } // Add comment referencing the removed dependency - issue, err := getIssueByID(x, depID) - - if err != nil { - return err - } - - user, _ := getUserByID(x, userID) - - repo, _ := getRepositoryByID(x, issue.RepoID) - - _, err = createIssueDependencyComment(sess, user, repo, issue, depID, false) + _, err = createIssueDependencyComment(sess, user, issue, dep, false) if err != nil { return err } // Create a new comment for the dependent issue - depIssue, err := getIssueByID(x, issueID) - - if err != nil { - return err - } - - repo, _ = getRepositoryByID(x, depIssue.RepoID) - - _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, false) + _, err = createIssueDependencyComment(sess, user, dep, issue, false) if err != nil { return err @@ -202,12 +154,12 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro } // check if issue can be closed -func IssueNoDependenciesLeft(issueID int64) bool{ +func IssueNoDependenciesLeft(issueID int64) bool { var issueDeps []IssueDependency err := x.Where("issue_id = ?", issueID).Find(&issueDeps) - for _, issueDep := range issueDeps{ + for _, issueDep := range issueDeps { issueDetails, _ := getIssueByID(x, issueDep.DependencyID) if !issueDetails.IsClosed { return false diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 3facf63bd..8d4bf6b99 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -15,7 +15,7 @@ import ( // Adds new dependencies func AddDependency(c *context.Context) { - dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) + depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) return @@ -28,12 +28,19 @@ func AddDependency(c *context.Context) { return } + // Dependency + dep, err := models.GetIssueByID(depID) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByID", err) + return + } + // Check if issue and dependency is the same - if dep == issueIndex{ + if dep.Index == issueIndex{ c.Flash.Error("You cannot make an issue depend on itself!") } else { - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep) + err, exists, depExists := models.CreateIssueDependency(c.User, issue, dep) if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go index 7abe925e6..2885673c8 100644 --- a/routers/repo/issue_dependency_remove.go +++ b/routers/repo/issue_dependency_remove.go @@ -15,7 +15,7 @@ import ( // IssueWatch sets issue watching func RemoveDependency(c *context.Context) { - dep, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) + depID, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) return @@ -41,9 +41,15 @@ func RemoveDependency(c *context.Context) { return } - err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) + // Dependency + dep, err := models.GetIssueByID(depID) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByID", err) + return + } + + err = models.RemoveIssueDependency(c.User, issue, dep, depType) if err != nil { - panic(err) c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } From 49309a33d22a59f46de6765713fc6474dca4bb5e Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 5 Sep 2017 18:55:09 +0200 Subject: [PATCH 19/25] Fixed issue comment title bug Signed-off-by: Konrad --- models/issue_comment.go | 2 +- models/issue_dependency.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 1ebd775de..900bb1226 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -516,7 +516,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep Repo: issue.Repo, Issue: issue, DependentIssue: dependantIssue, - Content: issue.Title, + Content: dependantIssue.Title, }) } diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 0947f607f..c33822013 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -83,7 +83,7 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists boo return err, exists, false } } - return nil, exists, false + return nil, exists, true } // Removes a dependency from an issue From 4e295d60cda88c2de89e3f92ad625acbc45b8bfa Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 5 Sep 2017 19:10:15 +0200 Subject: [PATCH 20/25] Fixed showing correct index in issue comment Signed-off-by: Konrad --- models/issue_comment.go | 12 ++++++++++++ routers/repo/issue.go | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/models/issue_comment.go b/models/issue_comment.go index 900bb1226..8cd7055c8 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -275,6 +275,18 @@ func (c *Comment) LoadAssignees() error { return nil } +// Load Dependent Issue Details +func (c *Comment) LoadDepIssueDetails() error { + var err error + if c.DependentIssueID > 0 { + c.DependentIssue, err = getIssueByID(x, c.DependentIssueID) + if err != nil { + return err + } + } + return nil +} + // MailParticipants sends new comment emails to repository watchers // and mentioned people. func (c *Comment) MailParticipants(e Engine, opType ActionType, issue *Issue) (err error) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 46873ddcc..def7ea6a9 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -28,6 +28,7 @@ import ( "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + "net/http" ) const ( @@ -683,6 +684,11 @@ func ViewIssue(ctx *context.Context) { ctx.Handle(500, "LoadAssignees", err) return } + } else if comment.Type == models.CommentTypeRemovedDependency || comment.Type == models.CommentTypeAddedDependency{ + if err = comment.LoadDepIssueDetails(); err != nil{ + ctx.Handle(http.StatusInternalServerError, "LoadDepIssueDetails", err) + return + } } } From 2dbeb63a75cd8f4f74437b23099c02e4b0e80627 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 13:46:46 +0200 Subject: [PATCH 21/25] Fully implemented Repo setting to enable/disable Issue Dependencies Signed-off-by: Konrad --- models/repo_unit.go | 5 +++++ routers/repo/issue.go | 1 + routers/repo/issue_dependency_add.go | 9 +++++++++ templates/repo/issue/view_content/sidebar.tmpl | 2 ++ 4 files changed, 17 insertions(+) diff --git a/models/repo_unit.go b/models/repo_unit.go index fd01aaf60..cb9e8ca77 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -149,6 +149,11 @@ func (r *RepoUnit) ExternalTrackerConfig() *ExternalTrackerConfig { return r.Config.(*ExternalTrackerConfig) } +// IssueDependenciesConfig returns config for UnitTypeIssueDependencies +func (r *RepoUnit) IssueDependenciesConfig() *UnitConfig{ + return r.Config.(*UnitConfig) +} + func getUnitsByRepoID(e Engine, repoID int64) (units []*RepoUnit, err error) { return units, e.Where("repo_id = ?", repoID).Find(&units) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index def7ea6a9..0a6fe9634 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -714,6 +714,7 @@ func ViewIssue(ctx *context.Context) { } // Get Dependencies + ctx.Data["IssueDependenciesEnabled"] = repo.UnitEnabled(models.UnitTypeIssueDependencies) ctx.Data["BlockedByDependencies"], err = repo.BlockedByDependencies(issue.ID) ctx.Data["BlockingDependencies"], err = repo.BlockingDependencies(issue.ID) diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 8d4bf6b99..43f7c0a85 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -15,6 +15,9 @@ import ( // Adds new dependencies func AddDependency(c *context.Context) { + + // TODO: should should an issue only have dependencies in it's own repo? + depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) @@ -28,6 +31,12 @@ func AddDependency(c *context.Context) { return } + // Check if the Repo is allowed to have dependencies + if !c.Repo.Repository.UnitEnabled(models.UnitTypeIssueDependencies) { + c.Handle(404, "MustEnableIssueDependencies", nil) + return + } + // Dependency dep, err := models.GetIssueByID(depID) if err != nil { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 84a3ee579..0716de0db 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -191,6 +191,7 @@ {{end}} {{end}} + {{if .IssueDependenciesEnabled}}
@@ -321,3 +322,4 @@
+{{end}} From 14b5d369c984e1f1a47718319da4558187c6e906 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 14:09:44 +0200 Subject: [PATCH 22/25] Implemented repo settings check on autoclose Signed-off-by: Konrad --- models/action.go | 2 +- models/issue_comment.go | 15 +++++++-------- models/issue_dependency.go | 15 +++++++++++++-- routers/repo/issue.go | 2 +- routers/repo/pull.go | 2 +- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/models/action.go b/models/action.go index b1ccfe074..ec1f630a8 100644 --- a/models/action.go +++ b/models/action.go @@ -473,7 +473,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err } // Check for dependencies, if there aren't any, close it - canbeClosed := IssueNoDependenciesLeft(issue.ID) + canbeClosed := IssueNoDependenciesLeft(issue) if canbeClosed { if err = issue.ChangeStatus(doer, repo, true); err != nil { diff --git a/models/issue_comment.go b/models/issue_comment.go index 8cd7055c8..6b5059faf 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -315,6 +315,12 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err if opts.Label != nil { LabelID = opts.Label.ID } + + var depId int64 = 0 + if opts.DependentIssue != nil { + depId = opts.DependentIssue.ID + } + comment := &Comment{ Type: opts.Type, PosterID: opts.Doer.ID, @@ -332,16 +338,9 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, DependentIssue: opts.DependentIssue, - DependentIssueID: opts.DependentIssue.ID, + DependentIssueID: depId, } - //fmt.Println(comment) - - // TODO: WHY ISNT THIS INSERTED?????? - // It seems to be inserted, but isnt. (Doesn't return an error, raw pasting - // the sql query in a database console does work). But after the function - // is called, there is no entry in the database. At least for type 12 and 13. - _, err = e.Insert(comment) if err != nil { return nil, err diff --git a/models/issue_dependency.go b/models/issue_dependency.go index c33822013..802514565 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -154,10 +154,21 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro } // check if issue can be closed -func IssueNoDependenciesLeft(issueID int64) bool { +func IssueNoDependenciesLeft(issue *Issue) bool { + + // Check if the Repo is allowed to have dependencies, if not return true (= issue can be closed) + // Otherwise check for all open dependencies + r, err := getRepositoryByID(x, issue.RepoID) + if err != nil { + return false + } + + if !r.UnitEnabled(UnitTypeIssueDependencies) { + return true + } var issueDeps []IssueDependency - err := x.Where("issue_id = ?", issueID).Find(&issueDeps) + err = x.Where("issue_id = ?", issue.ID).Find(&issueDeps) for _, issueDep := range issueDeps { issueDetails, _ := getIssueByID(x, issueDep.DependencyID) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 0a6fe9634..c14c1076a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -922,7 +922,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { // Check for open dependencies if form.Status == "close"{ - canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + canbeClosed := models.IssueNoDependenciesLeft(issue) if !canbeClosed { if issue.IsPull{ diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 77f178daa..caeddaa00 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -428,7 +428,7 @@ func MergePullRequest(ctx *context.Context) { pr.Issue = issue pr.Issue.Repo = ctx.Repo.Repository - canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + canbeClosed := models.IssueNoDependenciesLeft(issue) if !canbeClosed { ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") From c7696b17db5b8259afa022ac81eee367dd76b4f3 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 14:38:51 +0200 Subject: [PATCH 23/25] Moved languagestrings to ini Signed-off-by: Konrad --- options/locale/locale_en-US.ini | 17 ++++++++++++++--- routers/repo/issue_dependency_add.go | 6 +++--- templates/repo/issue/view_content/sidebar.tmpl | 16 ++++++++-------- templates/repo/settings/options.tmpl | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1f7188f82..dbd640eb9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -502,14 +502,14 @@ migrate.clone_local_path = or local server path migrate.permission_denied = You are not allowed to import local repositories. migrate.invalid_local_path = Invalid local path, it does not exist or not a directory. migrate.failed = Migration failed: %v -migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead. +migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git?lfs?fetch?--all' and 'git?lfs?push?--all' instead. mirror_from = mirror of forked_from = forked from fork_from_self = You cannot fork a repository you already own! copy_link = Copy copy_link_success = Copied! -copy_link_error = Press ⌘-C or Ctrl-C to copy +copy_link_error = Press ?-C or Ctrl-C to copy copied = Copied OK unwatch = Unwatch watch = Watch @@ -729,10 +729,21 @@ issues.dependency.title = Dependencies issues.dependency.no_dependencies = This issue currently doesn't have any dependencies. issues.dependency.add = Add issues.dependency.cancel = Cancel +issues.dependency.remove = Remove issues.dependency.add_header = Add New Dependency issues.dependency.issue_number = Issuenumber issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` issues.dependency.removed_dependency = `%[2]s removed a dependency %[3]s` +issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by +issues.dependency.pr_closing_blockedby = Closing this issue is blocked by +issues.dependency.issue_close_blocks = This issue blocks closing of the following issues +issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues +issues.dependency.remove_header = Remove Dependency +issues.dependency.remove_text = This will remove the dependency to this issue. Are you sure? You cannot undo this! +issues.dependency.setting = Issues can have dependencies +issues.dependency.add_error_same_issue = You cannot make an issue depend on itself! +issues.dependency.add_error_dep_not_exist = Dependend issue does not exist! +issues.dependency.add_error_dep_exists = Dependency already exists! pulls.desc = Pulls management your code review and merge requests @@ -1281,7 +1292,7 @@ auths.tip.github = Register a new OAuth application on https://github.com/settin auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/) auths.tip.openid_connect = Use the OpenID Connect Discovery URL (/.well-known/openid-configuration) to specify the endpoints -auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled. +auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the ?Allow this application to be used to Sign in with Twitter? option is enabled. auths.edit = Edit Authentication Settings auths.activated = This authentication is activated auths.new_success = The authentication '%s' has been added. diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 43f7c0a85..f4ce3c299 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -46,7 +46,7 @@ func AddDependency(c *context.Context) { // Check if issue and dependency is the same if dep.Index == issueIndex{ - c.Flash.Error("You cannot make an issue depend on itself!") + c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue")) } else { err, exists, depExists := models.CreateIssueDependency(c.User, issue, dep) @@ -56,11 +56,11 @@ func AddDependency(c *context.Context) { } if !depExists { - c.Flash.Error("Dependend issue does not exist!") + c.Flash.Error(c.Tr("add_error_dep_not_exist")) } if exists { - c.Flash.Error("Dependency already exists!") + c.Flash.Error(c.Tr("add_error_dep_exists")) } } diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 0716de0db..18fceb5c3 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -200,9 +200,9 @@ {{if .BlockedByDependencies}} {{if .Issue.IsPull}} - Closing this pull request is blocked by: + {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}: {{else}} - Closing this issue is blocked by: + {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}: {{end}}
@@ -233,9 +233,9 @@
{{if .Issue.IsPull}} - This pull request blocks closing of the following issues: + {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}: {{else}} - This issue blocks closing of the following issues: + {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}: {{end}} {{range .BlockingDependencies}} @@ -301,7 +301,7 @@
- Remove Dependency + {{.i18n.Tr "repo.issues.dependency.remove_header"}}
@@ -309,16 +309,16 @@
-

This will remove the dependency to this issue. Are you sure? You cannot undo this!

+

{{.i18n.Tr "repo.issues.dependency.remove_text"}}

- Cancel + {{.i18n.Tr "repo.issues.dependency.cancel"}}
- Delete + {{.i18n.Tr "repo.issues.dependency.remove"}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index e1a4831d8..742e6f225 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -156,7 +156,7 @@
- +
From 0eafc956ac5fe6d045606074100cd76bad274ec1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 12 Sep 2017 14:19:12 +0200 Subject: [PATCH 24/25] Resolved Conflicts Signed-off-by: Konrad --- options/locale/locale_en-US.ini | 17 + public/js/index.js | 27 +- public/vendor/plugins/autolink/autolink.js | 45 --- public/vendor/plugins/gitgraph/gitgraph.js | 401 -------------------- routers/routes/routes.go | 20 +- vendor/github.com/go-xorm/xorm/cache_lru.go | 284 -------------- 6 files changed, 57 insertions(+), 737 deletions(-) delete mode 100644 public/vendor/plugins/autolink/autolink.js delete mode 100644 public/vendor/plugins/gitgraph/gitgraph.js delete mode 100644 vendor/github.com/go-xorm/xorm/cache_lru.go diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dbd640eb9..67f714dd4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -744,6 +744,23 @@ issues.dependency.setting = Issues can have dependencies issues.dependency.add_error_same_issue = You cannot make an issue depend on itself! issues.dependency.add_error_dep_not_exist = Dependend issue does not exist! issues.dependency.add_error_dep_exists = Dependency already exists! +issues.tracker = Time tracker +issues.start_tracking_short = Start +issues.start_tracking = Start time tracking +issues.start_tracking_history = `started working %s` +issues.tracking_already_started = `You have already started time tracking on this issue!` +issues.stop_tracking = Stop +issues.stop_tracking_history = `stopped working %s` +issues.add_time = Add time manually +issues.add_time_short = Add +issues.add_time_cancel = Cancel +issues.add_time_history = `added spent time %s` +issues.add_time_hours = Hours +issues.add_time_minutes = Minutes +issues.add_time_sum_to_small = No time was entered +issues.cancel_tracking = Cancel +issues.cancel_tracking_history = `cancelled time tracking %s` +issues.time_spent_total = Total time spent pulls.desc = Pulls management your code review and merge requests diff --git a/public/js/index.js b/public/js/index.js index 92cad8cef..a31cf153c 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1823,23 +1823,30 @@ function cancelStopwatch() { $("#cancel_stopwatch_form").submit(); } -function showAddDependencyModal() { - $('.add-dependency') +function timeAddManual() { + $('.mini.modal') .modal({ duration: 200, onApprove: function() { - $('#addDependencyForm').submit(); + $('#add_time_manual_form').submit(); } }).modal('show') ; } +function toggleStopwatch() { + $("#toggle_stopwatch_form").submit(); +} +function cancelStopwatch() { + $("#cancel_stopwatch_form").submit(); +} + function deleteDependencyModal(id, type) { $('.remove-dependency') .modal({ closable: false, duration: 200, - onApprove: function() { + onApprove: function () { $('#removeDependencyID').val(id); $('#dependencyType').val(type); $('#removeDependencyForm').submit(); @@ -1847,3 +1854,15 @@ function deleteDependencyModal(id, type) { }).modal('show') ; } + +function showAddDependencyModal() { + $('.add-dependency') + .modal({ + duration: 200, + onApprove: function() { + $('#addDependencyForm').submit(); + + } + }).modal('show') + ; +} diff --git a/public/vendor/plugins/autolink/autolink.js b/public/vendor/plugins/autolink/autolink.js deleted file mode 100644 index 2993954ab..000000000 --- a/public/vendor/plugins/autolink/autolink.js +++ /dev/null @@ -1,45 +0,0 @@ -(function () { - var re = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-]*)?\??(?:[\-\+:=&;%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g; - function textNodesUnder(node) { - var textNodes = []; - if(typeof document.createTreeWalker === 'function') { - // Efficient TreeWalker - var currentNode, walker; - walker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT, null, false); - while(currentNode = walker.nextNode()) { - textNodes.push(currentNode); - } - } else { - // Less efficient recursive function - for(node = node.firstChild; node; node = node.nextSibling) { - if(node.nodeType === 3) { - textNodes.push(node); - } else { - textNodes = textNodes.concat(textNodesUnder(node)); - } - } - } - return textNodes; - } - - function processNode(node) { - re.lastIndex = 0; - var results = re.exec(node.textContent); - if(results !== null) { - if($(node).parents().filter('code').length === 0) { - $(node).replaceWith( - $('').html( - node.nodeValue.replace(re, '$1') - ) - ); - } - } - } - - jQuery.fn.autolink = function () { - this.each(function () { - textNodesUnder(this).forEach(processNode); - }); - return this; - }; -})(); diff --git a/public/vendor/plugins/gitgraph/gitgraph.js b/public/vendor/plugins/gitgraph/gitgraph.js deleted file mode 100644 index f6c73a2ec..000000000 --- a/public/vendor/plugins/gitgraph/gitgraph.js +++ /dev/null @@ -1,401 +0,0 @@ -/* - * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD 3-Clause - * Copyright (c) 2011, Terrence Lee - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -var gitGraph = function (canvas, rawGraphList, config) { - if (!canvas.getContext) { - return; - } - - if (typeof config === "undefined") { - config = { - unitSize: 20, - lineWidth: 3, - nodeRadius: 4 - }; - } - - var flows = []; - var graphList = []; - - var ctx = canvas.getContext("2d"); - - var init = function () { - var maxWidth = 0; - var i; - var l = rawGraphList.length; - var row; - var midStr; - - for (i = 0; i < l; i++) { - midStr = rawGraphList[i].replace(/\s+/g, " ").replace(/^\s+|\s+$/g, ""); - - maxWidth = Math.max(midStr.replace(/(\_|\s)/g, "").length, maxWidth); - - row = midStr.split(""); - - graphList.unshift(row); - } - - canvas.width = maxWidth * config.unitSize; - canvas.height = graphList.length * config.unitSize; - - ctx.lineWidth = config.lineWidth; - ctx.lineJoin = "round"; - ctx.lineCap = "round"; - }; - - var genRandomStr = function () { - var chars = "0123456789ABCDEF"; - var stringLength = 6; - var randomString = '', rnum, i; - for (i = 0; i < stringLength; i++) { - rnum = Math.floor(Math.random() * chars.length); - randomString += chars.substring(rnum, rnum + 1); - } - - return randomString; - }; - - var findFlow = function (id) { - var i = flows.length; - - while (i-- && flows[i].id !== id) {} - - return i; - }; - - var findColomn = function (symbol, row) { - var i = row.length; - - while (i-- && row[i] !== symbol) {} - - return i; - }; - - var findBranchOut = function (row) { - if (!row) { - return -1 - } - - var i = row.length; - - while (i-- && - !(row[i - 1] && row[i] === "/" && row[i - 1] === "|") && - !(row[i - 2] && row[i] === "_" && row[i - 2] === "|")) {} - - return i; - } - - var genNewFlow = function () { - var newId; - - do { - newId = genRandomStr(); - } while (findFlow(newId) !== -1); - - return {id:newId, color:"#" + newId}; - }; - - //draw method - var drawLineRight = function (x, y, color) { - ctx.strokeStyle = color; - ctx.beginPath(); - ctx.moveTo(x, y + config.unitSize / 2); - ctx.lineTo(x + config.unitSize, y + config.unitSize / 2); - ctx.stroke(); - }; - - var drawLineUp = function (x, y, color) { - ctx.strokeStyle = color; - ctx.beginPath(); - ctx.moveTo(x, y + config.unitSize / 2); - ctx.lineTo(x, y - config.unitSize / 2); - ctx.stroke(); - }; - - var drawNode = function (x, y, color) { - ctx.strokeStyle = color; - - drawLineUp(x, y, color); - - ctx.beginPath(); - ctx.arc(x, y, config.nodeRadius, 0, Math.PI * 2, true); - ctx.fill(); - }; - - var drawLineIn = function (x, y, color) { - ctx.strokeStyle = color; - - ctx.beginPath(); - ctx.moveTo(x + config.unitSize, y + config.unitSize / 2); - ctx.lineTo(x, y - config.unitSize / 2); - ctx.stroke(); - }; - - var drawLineOut = function (x, y, color) { - ctx.strokeStyle = color; - ctx.beginPath(); - ctx.moveTo(x, y + config.unitSize / 2); - ctx.lineTo(x + config.unitSize, y - config.unitSize / 2); - ctx.stroke(); - }; - - var draw = function (graphList) { - var colomn, colomnIndex, prevColomn, condenseIndex; - var x, y; - var color; - var nodePos, outPos; - var tempFlow; - var prevRowLength = 0; - var flowSwapPos = -1; - var lastLinePos; - var i, k, l; - var condenseCurrentLength, condensePrevLength = 0, condenseNextLength = 0; - - var inlineIntersect = false; - - //initiate for first row - for (i = 0, l = graphList[0].length; i < l; i++) { - if (graphList[0][i] !== "_" && graphList[0][i] !== " ") { - flows.push(genNewFlow()); - } - } - - y = canvas.height - config.unitSize * 0.5; - - //iterate - for (i = 0, l = graphList.length; i < l; i++) { - x = config.unitSize * 0.5; - - currentRow = graphList[i]; - nextRow = graphList[i + 1]; - prevRow = graphList[i - 1]; - - flowSwapPos = -1; - - condenseCurrentLength = currentRow.filter(function (val) { - return (val !== " " && val !== "_") - }).length; - - if (nextRow) { - condenseNextLength = nextRow.filter(function (val) { - return (val !== " " && val !== "_") - }).length; - } else { - condenseNextLength = 0; - } - - //pre process begin - //use last row for analysing - if (prevRow) { - if (!inlineIntersect) { - //intersect might happen - for (colomnIndex = 0; colomnIndex < prevRowLength; colomnIndex++) { - if (prevRow[colomnIndex + 1] && - (prevRow[colomnIndex] === "/" && prevRow[colomnIndex + 1] === "|") || - ((prevRow[colomnIndex] === "_" && prevRow[colomnIndex + 1] === "|") && - (prevRow[colomnIndex + 2] === "/"))) { - - flowSwapPos = colomnIndex; - - //swap two flow - tempFlow = {id:flows[flowSwapPos].id, color:flows[flowSwapPos].color}; - - flows[flowSwapPos].id = flows[flowSwapPos + 1].id; - flows[flowSwapPos].color = flows[flowSwapPos + 1].color; - - flows[flowSwapPos + 1].id = tempFlow.id; - flows[flowSwapPos + 1].color = tempFlow.color; - } - } - } - - if (condensePrevLength < condenseCurrentLength && - ((nodePos = findColomn("*", currentRow)) !== -1 && - (findColomn("_", currentRow) === -1))) { - - flows.splice(nodePos - 1, 0, genNewFlow()); - } - - if (prevRowLength > currentRow.length && - (nodePos = findColomn("*", prevRow)) !== -1) { - - if (findColomn("_", currentRow) === -1 && - findColomn("/", currentRow) === -1 && - findColomn("\\", currentRow) === -1) { - - flows.splice(nodePos + 1, 1); - } - } - } //done with the previous row - - prevRowLength = currentRow.length; //store for next round - colomnIndex = 0; //reset index - condenseIndex = 0; - condensePrevLength = 0; - while (colomnIndex < currentRow.length) { - colomn = currentRow[colomnIndex]; - - if (colomn !== " " && colomn !== "_") { - ++condensePrevLength; - } - - if (colomn === " " && - currentRow[colomnIndex + 1] && - currentRow[colomnIndex + 1] === "_" && - currentRow[colomnIndex - 1] && - currentRow[colomnIndex - 1] === "|") { - - currentRow.splice(colomnIndex, 1); - - currentRow[colomnIndex] = "/"; - colomn = "/"; - } - - //create new flow only when no intersetc happened - if (flowSwapPos === -1 && - colomn === "/" && - currentRow[colomnIndex - 1] && - currentRow[colomnIndex - 1] === "|") { - - flows.splice(condenseIndex, 0, genNewFlow()); - } - - //change \ and / to | when it's in the last position of the whole row - if (colomn === "/" || colomn === "\\") { - if (!(colomn === "/" && findBranchOut(nextRow) === -1)) { - if ((lastLinePos = Math.max(findColomn("|", currentRow), - findColomn("*", currentRow))) !== -1 && - (lastLinePos < colomnIndex - 1)) { - - while (currentRow[++lastLinePos] === " ") {} - - if (lastLinePos === colomnIndex) { - currentRow[colomnIndex] = "|"; - } - } - } - } - - if (colomn === "*" && - prevRow && - prevRow[condenseIndex + 1] === "\\") { - flows.splice(condenseIndex + 1, 1); - } - - if (colomn !== " ") { - ++condenseIndex; - } - - ++colomnIndex; - } - - condenseCurrentLength = currentRow.filter(function (val) { - return (val !== " " && val !== "_") - }).length; - - //do some clean up - if (flows.length > condenseCurrentLength) { - flows.splice(condenseCurrentLength, flows.length - condenseCurrentLength); - } - - colomnIndex = 0; - - //a little inline analysis and draw process - while (colomnIndex < currentRow.length) { - colomn = currentRow[colomnIndex]; - prevColomn = currentRow[colomnIndex - 1]; - - if (currentRow[colomnIndex] === " ") { - currentRow.splice(colomnIndex, 1); - x += config.unitSize; - - continue; - } - - //inline interset - if ((colomn === "_" || colomn === "/") && - currentRow[colomnIndex - 1] === "|" && - currentRow[colomnIndex - 2] === "_") { - - inlineIntersect = true; - - tempFlow = flows.splice(colomnIndex - 2, 1)[0]; - flows.splice(colomnIndex - 1, 0, tempFlow); - currentRow.splice(colomnIndex - 2, 1); - - colomnIndex = colomnIndex - 1; - } else { - inlineIntersect = false; - } - - color = flows[colomnIndex].color; - - switch (colomn) { - case "_" : - drawLineRight(x, y, color); - - x += config.unitSize; - break; - - case "*" : - drawNode(x, y, color); - break; - - case "|" : - drawLineUp(x, y, color); - break; - - case "/" : - if (prevColomn && - (prevColomn === "/" || - prevColomn === " ")) { - x -= config.unitSize; - } - - drawLineOut(x, y, color); - - x += config.unitSize; - break; - - case "\\" : - drawLineIn(x, y, color); - break; - } - - ++colomnIndex; - } - - y -= config.unitSize; - } - }; - - init(); - draw(graphList); -}; -// @end-license diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7dfaffe70..99f5cd73e 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -500,6 +500,19 @@ func RegisterRoutes(m *macaron.Macaron) { } }) m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) + m.Group("/times", func() { + m.Post("/add", bindIgnErr(auth.AddTimeManuallyForm{}), repo.AddTimeManually) + m.Group("/stopwatch", func() { + m.Post("/toggle", repo.IssueStopwatch) + m.Post("/cancel", repo.CancelStopwatch) + }) + + }, func(ctx *context.Context) { + if !ctx.Repo.CanUseTimetracker(repo.GetActionIssue(ctx), ctx.User) { + ctx.Handle(404, ctx.Req.RequestURI, nil) + return + } + }) }) m.Post("/labels", repo.UpdateIssueLabel, reqRepoWriter) @@ -613,7 +626,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/*", repo.WikiRaw) }, repo.MustEnableWiki, context.CheckUnit(models.UnitTypeWiki), context.CheckUnit(models.UnitTypeWiki)) - m.Get("/archive/*", repo.MustBeNotBare, repo.Download, context.CheckUnit(models.UnitTypeCode)) + m.Get("/archive/*", repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.Download) m.Group("/pulls/:index", func() { m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) @@ -633,10 +646,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/src/*", repo.SetEditorconfigIfExists, repo.Home) m.Get("/forks", repo.Forks) }, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) - m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.MustBeNotBare, repo.RawDiff, context.CheckUnit(models.UnitTypeCode)) + m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", + repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.RawDiff) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, - repo.SetDiffViewStyle, repo.MustBeNotBare, repo.CompareDiff, context.CheckUnit(models.UnitTypeCode)) + repo.SetDiffViewStyle, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.CompareDiff) }, ignSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) diff --git a/vendor/github.com/go-xorm/xorm/cache_lru.go b/vendor/github.com/go-xorm/xorm/cache_lru.go deleted file mode 100644 index c9672cebe..000000000 --- a/vendor/github.com/go-xorm/xorm/cache_lru.go +++ /dev/null @@ -1,284 +0,0 @@ -// Copyright 2015 The Xorm Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package xorm - -import ( - "container/list" - "fmt" - "sync" - "time" - - "github.com/go-xorm/core" -) - -// LRUCacher implments cache object facilities -type LRUCacher struct { - idList *list.List - sqlList *list.List - idIndex map[string]map[string]*list.Element - sqlIndex map[string]map[string]*list.Element - store core.CacheStore - mutex sync.Mutex - MaxElementSize int - Expired time.Duration - GcInterval time.Duration -} - -// NewLRUCacher creates a cacher -func NewLRUCacher(store core.CacheStore, maxElementSize int) *LRUCacher { - return NewLRUCacher2(store, 3600*time.Second, maxElementSize) -} - -// NewLRUCacher2 creates a cache include different params -func NewLRUCacher2(store core.CacheStore, expired time.Duration, maxElementSize int) *LRUCacher { - cacher := &LRUCacher{store: store, idList: list.New(), - sqlList: list.New(), Expired: expired, - GcInterval: core.CacheGcInterval, MaxElementSize: maxElementSize, - sqlIndex: make(map[string]map[string]*list.Element), - idIndex: make(map[string]map[string]*list.Element), - } - cacher.RunGC() - return cacher -} - -// RunGC run once every m.GcInterval -func (m *LRUCacher) RunGC() { - time.AfterFunc(m.GcInterval, func() { - m.RunGC() - m.GC() - }) -} - -// GC check ids lit and sql list to remove all element expired -func (m *LRUCacher) GC() { - m.mutex.Lock() - defer m.mutex.Unlock() - var removedNum int - for e := m.idList.Front(); e != nil; { - if removedNum <= core.CacheGcMaxRemoved && - time.Now().Sub(e.Value.(*idNode).lastVisit) > m.Expired { - removedNum++ - next := e.Next() - node := e.Value.(*idNode) - m.delBean(node.tbName, node.id) - e = next - } else { - break - } - } - - removedNum = 0 - for e := m.sqlList.Front(); e != nil; { - if removedNum <= core.CacheGcMaxRemoved && - time.Now().Sub(e.Value.(*sqlNode).lastVisit) > m.Expired { - removedNum++ - next := e.Next() - node := e.Value.(*sqlNode) - m.delIds(node.tbName, node.sql) - e = next - } else { - break - } - } -} - -// GetIds returns all bean's ids according to sql and parameter from cache -func (m *LRUCacher) GetIds(tableName, sql string) interface{} { - m.mutex.Lock() - defer m.mutex.Unlock() - if _, ok := m.sqlIndex[tableName]; !ok { - m.sqlIndex[tableName] = make(map[string]*list.Element) - } - if v, err := m.store.Get(sql); err == nil { - if el, ok := m.sqlIndex[tableName][sql]; !ok { - el = m.sqlList.PushBack(newSQLNode(tableName, sql)) - m.sqlIndex[tableName][sql] = el - } else { - lastTime := el.Value.(*sqlNode).lastVisit - // if expired, remove the node and return nil - if time.Now().Sub(lastTime) > m.Expired { - m.delIds(tableName, sql) - return nil - } - m.sqlList.MoveToBack(el) - el.Value.(*sqlNode).lastVisit = time.Now() - } - return v - } - - m.delIds(tableName, sql) - return nil -} - -// GetBean returns bean according tableName and id from cache -func (m *LRUCacher) GetBean(tableName string, id string) interface{} { - m.mutex.Lock() - defer m.mutex.Unlock() - if _, ok := m.idIndex[tableName]; !ok { - m.idIndex[tableName] = make(map[string]*list.Element) - } - tid := genID(tableName, id) - if v, err := m.store.Get(tid); err == nil { - if el, ok := m.idIndex[tableName][id]; ok { - lastTime := el.Value.(*idNode).lastVisit - // if expired, remove the node and return nil - if time.Now().Sub(lastTime) > m.Expired { - m.delBean(tableName, id) - return nil - } - m.idList.MoveToBack(el) - el.Value.(*idNode).lastVisit = time.Now() - } else { - el = m.idList.PushBack(newIDNode(tableName, id)) - m.idIndex[tableName][id] = el - } - return v - } - - // store bean is not exist, then remove memory's index - m.delBean(tableName, id) - return nil -} - -// clearIds clears all sql-ids mapping on table tableName from cache -func (m *LRUCacher) clearIds(tableName string) { - if tis, ok := m.sqlIndex[tableName]; ok { - for sql, v := range tis { - m.sqlList.Remove(v) - m.store.Del(sql) - } - } - m.sqlIndex[tableName] = make(map[string]*list.Element) -} - -// ClearIds clears all sql-ids mapping on table tableName from cache -func (m *LRUCacher) ClearIds(tableName string) { - m.mutex.Lock() - m.clearIds(tableName) - m.mutex.Unlock() -} - -func (m *LRUCacher) clearBeans(tableName string) { - if tis, ok := m.idIndex[tableName]; ok { - for id, v := range tis { - m.idList.Remove(v) - tid := genID(tableName, id) - m.store.Del(tid) - } - } - m.idIndex[tableName] = make(map[string]*list.Element) -} - -// ClearBeans clears all beans in some table -func (m *LRUCacher) ClearBeans(tableName string) { - m.mutex.Lock() - m.clearBeans(tableName) - m.mutex.Unlock() -} - -// PutIds pus ids into table -func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) { - m.mutex.Lock() - if _, ok := m.sqlIndex[tableName]; !ok { - m.sqlIndex[tableName] = make(map[string]*list.Element) - } - if el, ok := m.sqlIndex[tableName][sql]; !ok { - el = m.sqlList.PushBack(newSQLNode(tableName, sql)) - m.sqlIndex[tableName][sql] = el - } else { - el.Value.(*sqlNode).lastVisit = time.Now() - } - m.store.Put(sql, ids) - if m.sqlList.Len() > m.MaxElementSize { - e := m.sqlList.Front() - node := e.Value.(*sqlNode) - m.delIds(node.tbName, node.sql) - } - m.mutex.Unlock() -} - -// PutBean puts beans into table -func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) { - m.mutex.Lock() - var el *list.Element - var ok bool - - if el, ok = m.idIndex[tableName][id]; !ok { - el = m.idList.PushBack(newIDNode(tableName, id)) - m.idIndex[tableName][id] = el - } else { - el.Value.(*idNode).lastVisit = time.Now() - } - - m.store.Put(genID(tableName, id), obj) - if m.idList.Len() > m.MaxElementSize { - e := m.idList.Front() - node := e.Value.(*idNode) - m.delBean(node.tbName, node.id) - } - m.mutex.Unlock() -} - -func (m *LRUCacher) delIds(tableName, sql string) { - if _, ok := m.sqlIndex[tableName]; ok { - if el, ok := m.sqlIndex[tableName][sql]; ok { - delete(m.sqlIndex[tableName], sql) - m.sqlList.Remove(el) - } - } - m.store.Del(sql) -} - -// DelIds deletes ids -func (m *LRUCacher) DelIds(tableName, sql string) { - m.mutex.Lock() - m.delIds(tableName, sql) - m.mutex.Unlock() -} - -func (m *LRUCacher) delBean(tableName string, id string) { - tid := genID(tableName, id) - if el, ok := m.idIndex[tableName][id]; ok { - delete(m.idIndex[tableName], id) - m.idList.Remove(el) - m.clearIds(tableName) - } - m.store.Del(tid) -} - -// DelBean deletes beans in some table -func (m *LRUCacher) DelBean(tableName string, id string) { - m.mutex.Lock() - m.delBean(tableName, id) - m.mutex.Unlock() -} - -type idNode struct { - tbName string - id string - lastVisit time.Time -} - -type sqlNode struct { - tbName string - sql string - lastVisit time.Time -} - -func genSQLKey(sql string, args interface{}) string { - return fmt.Sprintf("%v-%v", sql, args) -} - -func genID(prefix string, id string) string { - return fmt.Sprintf("%v-%v", prefix, id) -} - -func newIDNode(tbName string, id string) *idNode { - return &idNode{tbName, id, time.Now()} -} - -func newSQLNode(tbName, sql string) *sqlNode { - return &sqlNode{tbName, sql, time.Now()} -} From 8d1f9fe0df7a60edbb72cff08469ba0fd9632eed Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 12 Sep 2017 22:20:57 +0200 Subject: [PATCH 25/25] Fixed conflict with timetracking Signed-off-by: Konrad --- public/js/index.js | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index a31cf153c..bfc155d2f 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1824,7 +1824,7 @@ function cancelStopwatch() { } function timeAddManual() { - $('.mini.modal') + $('.time-add-manual') .modal({ duration: 200, onApprove: function() { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 18fceb5c3..b966a0deb 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -149,7 +149,7 @@
-
+
{{.i18n.Tr "repo.issues.add_time"}}