From 52378bbaf46ab7257f17804687c54205bf36dde1 Mon Sep 17 00:00:00 2001 From: Patrick Aljord Date: Wed, 29 Jul 2020 01:30:17 +0200 Subject: [PATCH 1/4] make it possible to order boards and issues in projects --- models/issue.go | 6 +- models/project.go | 25 +++++ models/project_board.go | 53 +++++++---- models/project_issue.go | 10 +- modules/auth/repo_form.go | 20 ++++ routers/repo/projects.go | 33 ++++++- routers/routes/routes.go | 2 + templates/repo/projects/view.tmpl | 31 +++--- web_src/js/features/projects.js | 151 +++++++++++++++++++++++------- 9 files changed, 259 insertions(+), 72 deletions(-) diff --git a/models/issue.go b/models/issue.go index ee75623f53025..407702f865bc2 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1180,14 +1180,14 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) { if opts.ProjectID > 0 { sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). - And("project_issue.project_id=?", opts.ProjectID) + And("project_issue.project_id=?", opts.ProjectID).OrderBy("priority") } if opts.ProjectBoardID != 0 { if opts.ProjectBoardID > 0 { - sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID})) + sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}).OrderBy("priority")) } else { - sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0})) + sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).OrderBy("priority")) } } diff --git a/models/project.go b/models/project.go index e032da351dde4..c135184655c5e 100644 --- a/models/project.go +++ b/models/project.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" @@ -305,3 +306,27 @@ func deleteProjectByID(e Engine, id int64) error { return updateRepositoryProjectCount(e, p.RepoID) } + +// Update given boards priority for a project +func UpdateBoards(boards []ProjectBoard) error { + for _, board := range boards { + if _, err := x.ID(board.ID).Cols("priority").Update(&board); err != nil { + log.Info("failed updating board priorities %s", err) + return err + } + + } + return nil +} + +// Update given issue priority and column +func UpdateBoardIssues(issues []ProjectIssue) error { + for _, issue := range issues { + if _, err := x.ID(issue.ID).Cols("priority", "project_board_id").Update(&issue); err != nil { + log.Info("failed updating cards priorities %s", err) + return err + } + + } + return nil +} diff --git a/models/project_board.go b/models/project_board.go index 260fc8304b22e..5385bacdae8c0 100644 --- a/models/project_board.go +++ b/models/project_board.go @@ -5,6 +5,7 @@ package models import ( + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -32,9 +33,10 @@ const ( // ProjectBoard is used to represent boards on a project type ProjectBoard struct { - ID int64 `xorm:"pk autoincr"` - Title string - Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board + ID int64 `xorm:"pk autoincr"` + Title string + Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board + Priority int ProjectID int64 `xorm:"INDEX NOT NULL"` CreatorID int64 `xorm:"NOT NULL"` @@ -42,7 +44,8 @@ type ProjectBoard struct { CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` - Issues []*Issue `xorm:"-"` + Issues []*Issue `xorm:"-"` + ProjectIssues []*ProjectIssue `xorm:"-"` } // IsProjectBoardTypeValid checks if the project board type is valid @@ -174,7 +177,7 @@ func GetProjectBoards(projectID int64) ([]*ProjectBoard, error) { var boards = make([]*ProjectBoard, 0, 5) - sess := x.Where("project_id=?", projectID) + sess := x.Where("project_id=?", projectID).OrderBy("priority") return boards, sess.Find(&boards) } @@ -188,33 +191,43 @@ func GetUncategorizedBoard(projectID int64) (*ProjectBoard, error) { } // LoadIssues load issues assigned to this board -func (b *ProjectBoard) LoadIssues() (IssueList, error) { +func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) { var boardID int64 if !b.Default { boardID = b.ID } else { // Issues without ProjectBoardID - boardID = -1 + boardID = 0 } - issues, err := Issues(&IssuesOptions{ - ProjectBoardID: boardID, - ProjectID: b.ProjectID, - }) - b.Issues = issues - return issues, err + var projectIssuesDB []*ProjectIssue + var projectIssues []*ProjectIssue + err := x.Table("project_issue").Where("project_board_id = ?", boardID). + OrderBy("priority").Find(&projectIssuesDB) + for _, projectIssue := range projectIssuesDB { + if issue, err := getIssueByID(x, projectIssue.IssueID); err != nil { + log.Info("failed getting projectIssue's issue %v\n", err) + } else { + issue.LoadLabels() + issue.LoadMilestone() + issue.loadAssignees(x) + projectIssue.Issue = issue + projectIssues = append(projectIssues, projectIssue) + } + } + + b.ProjectIssues = projectIssues + return projectIssues, err } // LoadIssues load issues assigned to the boards -func (bs ProjectBoardList) LoadIssues() (IssueList, error) { - issues := make(IssueList, 0, len(bs)*10) +func (bs ProjectBoardList) LoadIssues() error { for i := range bs { - il, err := bs[i].LoadIssues() + il, err := bs[i].LoadProjectIssues() if err != nil { - return nil, err + return err } - bs[i].Issues = il - issues = append(issues, il...) + bs[i].ProjectIssues = il } - return issues, nil + return nil } diff --git a/models/project_issue.go b/models/project_issue.go index c41bfe5158679..4c88e111f8b39 100644 --- a/models/project_issue.go +++ b/models/project_issue.go @@ -12,9 +12,13 @@ import ( // ProjectIssue saves relation from issue to a project type ProjectIssue struct { - ID int64 `xorm:"pk autoincr"` - IssueID int64 `xorm:"INDEX"` - ProjectID int64 `xorm:"INDEX"` + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"INDEX"` + ProjectID int64 `xorm:"INDEX"` + IssueTitle string `xorm:"-"` + IssueIsPull bool `xorm:"-"` + Priority int + Issue *Issue `xorm:"-"` // If 0, then it has not been added to a specific board in the project ProjectBoardID int64 `xorm:"INDEX"` diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 039b0cb583a09..806cf1b2e42b7 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -759,3 +759,23 @@ type DeadlineForm struct { func (f *DeadlineForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { return validate(errs, ctx.Data, f, ctx.Locale) } + +// UpdateBoardPriorityForm form for updating cards on drag and drop +type UpdateBoardPriorityForm struct { + Boards []models.ProjectBoard `form:"boards" json:"boards"` +} + +// Validate validates the fields +func (f *UpdateBoardPriorityForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { + return validate(errs, ctx.Data, f, ctx.Locale) +} + +// UpdateIssuePriorityBoardForm form for updating issue on drag and drop +type UpdateIssuePriorityBoardForm struct { + Issues []models.ProjectIssue `form:"issues" json:"issues"` +} + +// Validate validates the fields +func (f *UpdateIssuePriorityBoardForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { + return validate(errs, ctx.Data, f, ctx.Locale) +} diff --git a/routers/repo/projects.go b/routers/repo/projects.go index 07327df9eb06d..5297a0cf1ebb0 100644 --- a/routers/repo/projects.go +++ b/routers/repo/projects.go @@ -286,7 +286,7 @@ func ViewProject(ctx *context.Context) { allBoards := models.ProjectBoardList{uncategorizedBoard} allBoards = append(allBoards, boards...) - if ctx.Data["Issues"], err = allBoards.LoadIssues(); err != nil { + if err = allBoards.LoadIssues(); err != nil { ctx.ServerError("LoadIssuesOfBoards", err) return } @@ -598,3 +598,34 @@ func CreateProjectPost(ctx *context.Context, form auth.UserCreateProjectForm) { ctx.Flash.Success(ctx.Tr("repo.projects.create_success", form.Title)) ctx.Redirect(setting.AppSubURL + "/") } + +// UpdateBoardsPriorityPost takes a slice of boards and updates their priority order on drag and drop +func UpdateBoardsPriorityPost(ctx *context.Context, form auth.UpdateBoardPriorityForm) { + if ctx.Written() { + return + } + + if ctx.HasError() { + return + } + + boards := form + models.UpdateBoards(form.Boards) + ctx.JSON(200, boards) +} + +// UpdateBoardIssuePriority takes a slice of ProjectIssue and updates their priority order on drag and drop +func UpdateBoardIssuePriority(ctx *context.Context, form auth.UpdateIssuePriorityBoardForm) { + if ctx.Written() { + return + } + + if ctx.HasError() { + return + } + + issues := form + models.UpdateBoardIssues(form.Issues) + + ctx.JSON(200, issues) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 285510dbe355f..f47e79d895110 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -956,9 +956,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/edit", repo.EditProject) m.Post("/edit", bindIgnErr(auth.CreateProjectForm{}), repo.EditProjectPost) + m.Put("/updateIssuesPriorities", bindIgnErr(auth.UpdateIssuePriorityBoardForm{}), repo.UpdateBoardIssuePriority) m.Post("/^:action(open|close)$", repo.ChangeProjectStatus) m.Group("/:boardID", func() { + m.Put("updatePriorities", bindIgnErr(auth.UpdateBoardPriorityForm{}), repo.UpdateBoardsPriorityPost) m.Put("", bindIgnErr(auth.EditProjectBoardTitleForm{}), repo.EditProjectBoardTitle) m.Delete("", repo.DeleteProjectBoard) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index ee82f24010241..20ba86e0b65c8 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -69,10 +69,11 @@
-
+
{{ range $board := .Boards }} -
+
{{.Title}}
{{if and $.CanWriteProjects (not $.Repository.IsArchived) $.PageIsProjects (ne .ID 0)}} @@ -135,32 +136,36 @@
-
+
- {{ range .Issues }} + {{ range .ProjectIssues }} -
+
- - {{if .IsPull}}{{svg "octicon-git-merge"}} - {{else if .IsClosed}}{{svg "octicon-issue-closed"}} + + {{if .Issue.IsPull}}{{svg "octicon-git-merge"}} + {{else if .Issue.IsClosed}}{{svg "octicon-issue-closed"}} {{else}}{{svg "octicon-issue-opened"}} {{end}} - #{{.Index}} {{.Title}} + #{{.IssueID}} {{.Issue.Title}}
- {{ if .MilestoneID }} - - {{svg "octicon-milestone"}} {{ .Milestone.Name }} + {{ if .Issue.MilestoneID }} + + {{svg "octicon-milestone"}} {{ .Issue.Milestone.Name }} {{ end }}
- {{ range .Labels }} + {{ range .Issue.Labels }} {{.Name}} {{ end }}
diff --git a/web_src/js/features/projects.js b/web_src/js/features/projects.js index 13318c9f89e56..3b7464dc3e696 100644 --- a/web_src/js/features/projects.js +++ b/web_src/js/features/projects.js @@ -1,50 +1,137 @@ -const {csrf} = window.config; +const { csrf } = window.config; export default async function initProject() { if (!window.config || !window.config.PageIsProjects) { return; } - const {Sortable} = await import(/* webpackChunkName: "sortable" */'sortablejs'); + const { Sortable } = await import( + /* webpackChunkName: "sortable" */ 'sortablejs' + ); const boardColumns = document.getElementsByClassName('board-column'); + const colContainer = document.getElementById('board-container'); + let projectURL = ''; + if (colContainer && colContainer.dataset) { + projectURL = colContainer.dataset.url; + } + $('.draggable-cards').each(function(i, eli) { + new Sortable(eli, { + group: 'shared', + filter: '.ignore-elements', + animation: 150, + // Element dragging ended + onEnd: function(/**Event*/ evt) { + var itemEl = evt.item; // dragged HTMLElement + let cardsFrom = []; + let cardsTo = []; + $(evt.from).each((i, v) => { + let column = $($(v)[0]).data(); + $(v) + .children() + .each((j, y) => { + let card = $(y).data(); + if ( + card && + card.id && + evt.oldDraggableIndex !== evt.newDraggableIndex + ) + cardsFrom.push({ + id: card.id, + priority: j, + ProjectBoardID: column.columnId, + }); + }); + }); - for (const column of boardColumns) { - new Sortable( - column.getElementsByClassName('board')[0], - { - group: 'shared', - animation: 150, - onAdd: (e) => { - $.ajax(`${e.to.dataset.url}/${e.item.dataset.issue}`, { - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - type: 'POST', - error: () => { - e.from.insertBefore(e.item, e.from.children[e.oldIndex]); - }, + $(evt.to).each((i, v) => { + let column = $($(v)[0]).data(); + $(v) + .children() + .each((j, y) => { + let card = $(y).data(); + if (card && card.id) { + cardsTo.push({ + id: card.id, + priority: j, + ProjectBoardID: column.columnId, + }); + } + }); + }); + fetch(`${projectURL}/updateIssuesPriorities`, { + method: 'PUT', + headers: { + 'X-Csrf-Token': csrf, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + issues: cardsTo.concat(cardsFrom), + }), + }) + .then(function(res) { + return res.json(); + }) + .then(function(data) { + console.log(JSON.stringify(data)); }); - }, - } - ); - } + }, + }); + }); - $('.edit-project-board').each(function () { - const projectTitleLabel = $(this).closest('.board-column-header').find('.board-label'); + if (colContainer) { + new Sortable(colContainer, { + group: 'cols', + animation: 150, + filter: '.ignore-elements', + // Element dragging ended + onEnd: function(/**Event*/ evt) { + var itemEl = evt.item; // dragged HTMLElement + let columns = []; + $(evt.to).each((i, v) => { + $(v) + .children() + .each((j, y) => { + let column = $(y).data(); + if (column && column.columnId) { + columns.push({ + id: column.columnId, + priority: j, + }); + } + }); + }); + fetch(`${projectURL}/updatePriorities`, { + method: 'PUT', + headers: { 'X-Csrf-Token': csrf, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + boards: columns, + }), + }) + .then(function(res) { + return res.json(); + }) + .then(function(data) { + console.log(JSON.stringify(data)); + }); + }, + }); + } + $('.edit-project-board').each(function() { + const projectTitleLabel = $(this) + .closest('.board-column-header') + .find('.board-label'); const projectTitleInput = $(this).find( - '.content > .form > .field > .project-board-title' + '.content > .form > .field > .project-board-title', ); $(this) .find('.content > .form > .actions > .red') - .on('click', function (e) { + .on('click', function(e) { e.preventDefault(); $.ajax({ url: $(this).data('url'), - data: JSON.stringify({title: projectTitleInput.val()}), + data: JSON.stringify({ title: projectTitleInput.val() }), headers: { 'X-Csrf-Token': csrf, 'X-Remote': true, @@ -59,8 +146,8 @@ export default async function initProject() { }); }); - $('.delete-project-board').each(function () { - $(this).click(function (e) { + $('.delete-project-board').each(function() { + $(this).click(function(e) { e.preventDefault(); $.ajax({ @@ -77,14 +164,14 @@ export default async function initProject() { }); }); - $('#new_board_submit').click(function (e) { + $('#new_board_submit').click(function(e) { e.preventDefault(); const boardTitle = $('#new_board'); $.ajax({ url: $(this).data('url'), - data: JSON.stringify({title: boardTitle.val()}), + data: JSON.stringify({ title: boardTitle.val() }), headers: { 'X-Csrf-Token': csrf, 'X-Remote': true, From 68702e8d36933bb7ade9e4803d716f1508203794 Mon Sep 17 00:00:00 2001 From: Patrick Aljord Date: Thu, 30 Jul 2020 02:29:49 +0200 Subject: [PATCH 2/4] show issue details in projects/view --- models/project_board.go | 3 +- routers/repo/issue.go | 10 +- routers/routes/routes.go | 1 + .../repo/issue/view_content/sidebar.tmpl | 7 +- templates/repo/projects/view.tmpl | 4 +- web_src/js/index.js | 127 ++++++++++++++++-- web_src/less/_repository.less | 22 +++ 7 files changed, 156 insertions(+), 18 deletions(-) diff --git a/models/project_board.go b/models/project_board.go index 5385bacdae8c0..80be9f89d5f68 100644 --- a/models/project_board.go +++ b/models/project_board.go @@ -202,7 +202,8 @@ func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) { } var projectIssuesDB []*ProjectIssue var projectIssues []*ProjectIssue - err := x.Table("project_issue").Where("project_board_id = ?", boardID). + err := x.Table("project_issue").Where("project_board_id = ? and project_id =?", + boardID, b.ProjectID). OrderBy("priority").Find(&projectIssuesDB) for _, projectIssue := range projectIssuesDB { if issue, err := getIssueByID(x, projectIssue.IssueID); err != nil { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 009af784e775a..1932cee92239d 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -48,6 +48,7 @@ const ( issueTemplateKey = "IssueTemplate" issueTemplateTitleKey = "IssueTemplateTitle" + tplSidebar = "repo/issue/view_content/sidebar" ) var ( @@ -1486,7 +1487,14 @@ func ViewIssue(ctx *context.Context) { ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.User.IsAdmin) ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons ctx.Data["RefEndName"] = git.RefEndName(issue.Ref) - ctx.HTML(200, tplIssueView) + + if ctx.Params(":sidebar") == "true" { + ctx.Data["Sidebar"] = true + ctx.HTML(200, tplSidebar) + } else { + ctx.Data["Sidebar"] = false + ctx.HTML(200, tplIssueView) + } } // GetActionIssue will return the issue which is used in the context. diff --git a/routers/routes/routes.go b/routers/routes/routes.go index f47e79d895110..98dd34341e672 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -940,6 +940,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("", func() { m.Get("/^:type(issues|pulls)$", repo.Issues) m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue) + m.Get("/^:type(issues|pulls)$/:index/sidebar/:sidebar", repo.ViewIssue) m.Get("/labels/", reqRepoIssuesOrPullsReader, repo.RetrieveLabels, repo.Labels) m.Get("/milestones", reqRepoIssuesOrPullsReader, repo.Milestones) }, context.RepoRef()) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index dad4f7e125bfb..046e0abf24c79 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -1,5 +1,8 @@
+ {{if eq .Sidebar true}} +

#{{.Issue.ID}} {{.Issue.Title}}

+ {{end}} {{template "repo/issue/branch_selector_field" .}} {{if .Issue.IsPull }} @@ -554,7 +557,7 @@
+ method="post" id="lock-form"> {{.CsrfTokenHtml}} {{ if not .Issue.IsLocked }} @@ -563,7 +566,7 @@
-
+ ` + let html = ` +
+ `; + $('#current-card-details').html(html); + $('#current-card-details-input').html(searchHtml); + sortCards('#issue-results') + }); + + function sortCards(selector){ + $(selector).each(function(i, eli) { + new Sortable(eli, { + group: 'shared', + filter: '.ignore-elements', + animation: 150, + onEnd: function(/**Event*/ evt) { + var itemEl = evt.item; // dragged HTMLElement + let cardsFrom = []; + let cardsTo = []; + $(evt.from).each((i, v) => { + let column = $($(v)[0]).data(); + $(v) + .children() + .each((j, y) => { + let card = $(y).data(); + if ( + card && + card.id && + evt.oldDraggableIndex !== evt.newDraggableIndex + ) + cardsFrom.push({ + id: card.id, + priority: j, + ProjectBoardID: column.columnId + }); + }); + }); + + $(evt.to).each((i, v) => { + let column = $($(v)[0]).data(); + $(v) + .children() + .each((j, y) => { + let card = y.dataset; + if (card && card.id) { + cardsTo.push({ + id: parseInt(card.id), + priority: parseInt(j), + ProjectBoardID: parseInt(column.columnId), + issueid: parseInt(card.issueid), + projectID: parseInt(projectID) + }); + } else if (card && card.issueid && card.id === 0){ + cardsTo.push({ + issueid: parseInt(card.issueid), + priority: parseInt(j), + ProjectBoardID: parseInt(column.columnId), + projectID: parseInt(projectID) + }) + } + }); + }); + fetch(`${projectURL}/updateIssuesPriorities`, { + method: 'PUT', + headers: { + 'X-Csrf-Token': csrf, + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + issues: cardsTo.concat(cardsFrom) + }) + }) + .then(function(res) { + return res.json(); + }) + .then(function(data) { + if(data && data.length >0){ + $(data).each((i,x)=>{$(`.board-column .cards [data-issueid=${x.IssueID}]`).attr('data-id', x.ID)}) + } + }); + } + }); + }); + } } + diff --git a/web_src/js/index.js b/web_src/js/index.js index 24f380001aa8d..0d2d7ab6218ac 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -186,15 +186,16 @@ function updateIssuesMeta(url, action, issueIds, elementId) { }, success: resolve }).done(data => { - console.log('done', data); - console.log(url, action, issueIds, elementId, isAdd); let projectID = $('[data-project]').data('project'); - + console.log({url: url, action: action, issueIds: issueIds, elementId: elementId, isAdd: isAdd}) if (projectID === elementId) { - console.log('same project, don\'t remove!'); + //same project, don't remove } else { - $(`.board-card[data-issueid=${elementId}]`).remove(); - console.log('different project, please remove!'); + if(url.endsWith("/projects")){ + $(`.board-card[data-issueid=${issueIds}]`).remove(); + $('#current-card-details').hide(); + //different project, removing + } } }); })); @@ -828,6 +829,8 @@ async function initRepository() { $('body').keyup(e => { if (e.keyCode === 27) { $('#current-card-details').hide(); + $('#current-card-details').html(''); + $('#current-card-details-input').html(''); } }); @@ -2419,10 +2422,12 @@ function initTemplateSearch() { $(document).ready(async () => { // Show issue or pr in board sidebar - $('.draggable-cards [data-url]').on("click", e => { + $('.board-column').on('click', '.draggable-cards [data-url]', e => { e.preventDefault(); + $("#current-card-details").html(""); + $("#current-card-details-input").html(""); let data = $(e.currentTarget).data(); - $('#current-card-details').css('visibility', 'visible'); + $('#current-card-details').css('visibility', 'visible'); $('#current-card-details').show(); reloadIssuesActions(data); }); diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 2630a0c4a2f0d..0276b1c5be470 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3364,3 +3364,20 @@ td.blob-excerpt { display: flex; flex-direction: column; } + +#issue-search { + margin: 1rem 0.8rem 0 0.1rem; + width: 300px; + position: absolute; + right: 0px; + z-index: 1000; + padding: 0.5rem !important; + flex: 0 0 auto; + display: flex; + flex-direction: column; +} + +#issue-results { + margin-top: 4rem; + padding: 0.5rem; +} From ee388a2cb14caa04c8894bd09198af677b1fb4e4 Mon Sep 17 00:00:00 2001 From: Patrick Aljord Date: Mon, 17 Aug 2020 13:38:48 +0200 Subject: [PATCH 4/4] fix backend lint as reported in https://drone.gitea.io/go-gitea/gitea/28939/1/4 use log.Error instead of log.Info fix comments fix eslint fix goimport order add migrations for project priorities fix _repository.less lint errors update swagger fixes according to @6543 suggestions s/NotInProjectID/ExcludeProjectID/g update boards priority in a single transaction as per @zeripath Co-authored-by: zeripath update swagger Clean up the indenting Co-authored-by: zeripath use tabs Co-authored-by: zeripath use tabs add loadRepository as per @zeripath suggestion move projects css to features/projects.less as per @silverwind request https://github.com/go-gitea/gitea/pull/12506#pullrequestreview-468681403 use transaction to update projects issues priorities as per @zeripath suggestion https://github.com/go-gitea/gitea/pull/12506#discussion_r471497361 make import fit on one line make use of loadRepository indent html properly as per suggestion by @silverwind https://github.com/go-gitea/gitea/pull/12506#discussion_r471665814 remove non-working code as per @zeripath suggestion https://github.com/go-gitea/gitea/pull/12506#discussion_r471562825 remove non-used code as per @zeripath suggestion https://github.com/go-gitea/gitea/pull/12506#discussion_r471517773 fix syntax, remove content-type on request https://github.com/go-gitea/gitea/pull/12506#discussion_r471763018 use closest instead of parent as per @silverwind suggestion https://github.com/go-gitea/gitea/pull/12506#pullrequestreview-468821354 use for instead of forEach because @silverwind use for instead of forEach because @silverwind https://github.com/go-gitea/gitea/pull/12506#pullrequestreview-468820176 use // falls through as per @silverwind https://github.com/go-gitea/gitea/pull/12506#discussion_r471766793 listen to body keyup only on project page https://github.com/go-gitea/gitea/pull/12506#pullrequestreview-468822919 Update models/project_board.go Co-authored-by: Lauris BH move all issue related code to its own util file and re-use those functions in index.js and projects.js as per @silverwind and @zeripath Update models/project_issue.go Co-authored-by: 6543 <6543@obermui.de> fix linting Update web_src/js/features/issuesutil.js Co-authored-by: silverwind Update web_src/js/features/issuesutil.js Co-authored-by: silverwind Update web_src/js/features/issuesutil.js Co-authored-by: silverwind Update web_src/js/features/projects.js Co-authored-by: silverwind Update web_src/js/features/projects.js Co-authored-by: silverwind Update models/project_issue.go Update models/issue.go Co-authored-by: zeripath Update web_src/js/features/issuesutil.js Co-authored-by: silverwind various js fix per @silverwind suggestions various fixes according to @silverwind and @zeripath use await for fetch when possible specify table name as per @lafriks suggestion specify table name as per @lafriks suggestion in more queries https://github.com/go-gitea/gitea/pull/12506#pullrequestreview-470332543 https://github.com/go-gitea/gitea/pull/12506#discussion_r472931579 Update templates/repo/projects/view.tmpl Co-authored-by: silverwind Update templates/repo/projects/view.tmpl Co-authored-by: silverwind Update web_src/js/features/projects.js Co-authored-by: silverwind fix project_issue table name in query make another fetch async as per @silverwind Update models/project.go Co-authored-by: Lauris BH Update models/project.go Co-authored-by: Lauris BH more and rename UpdateBoards functions as per @6543 Update models/project.go Co-authored-by: Lauris BH Update models/project.go Co-authored-by: Lauris BH add / to route fixup! fix backend lint as reported in https://drone.gitea.io/go-gitea/gitea/28939/1/4 Update models/project.go Co-authored-by: zeripath Update routers/repo/issue.go Co-authored-by: zeripath Update web_src/less/features/projects.less Co-authored-by: silverwind fix uneeded column in query and remove css class as suggested by @silverwind Update models/project.go Co-authored-by: Lauris BH add X to close sidebar and other css suggestions by @silverwind add emoji to project issue titles use issue.* instead as suggested by @zeripath still waiting for xorm v1.0.5 to update go.mod fix project_issue query for now fix card details css --- go.sum | 5 + models/issue.go | 30 +- models/migrations/migrations.go | 2 + models/migrations/v159.go | 26 + models/project.go | 51 +- models/project_board.go | 54 +- models/project_issue.go | 55 +- modules/auth/repo_form.go | 2 +- modules/markup/html.go | 13 +- modules/templates/helper.go | 14 +- routers/api/v1/repo/issue.go | 50 +- routers/repo/issue.go | 4 +- routers/repo/projects.go | 15 +- routers/routes/routes.go | 5 +- .../repo/issue/view_content/sidebar.tmpl | 8 +- templates/repo/projects/view.tmpl | 24 +- templates/swagger/v1_json.tmpl | 19 + web_src/js/features/issuesutil.js | 1510 ++++++++++++++++ web_src/js/features/projects.js | 227 +-- web_src/js/index.js | 1516 +---------------- web_src/less/_repository.less | 115 -- web_src/less/features/projects.less | 143 ++ web_src/less/index.less | 1 + 23 files changed, 2019 insertions(+), 1870 deletions(-) create mode 100644 models/migrations/v159.go create mode 100644 web_src/js/features/issuesutil.js create mode 100644 web_src/less/features/projects.less diff --git a/go.sum b/go.sum index 7710cbc63f5a2..eb00e7745cfb1 100644 --- a/go.sum +++ b/go.sum @@ -288,6 +288,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethantkoenig/rupture v0.0.0-20181029165146-c3b3b810dc77 h1:ZLWiTTzTUBb0WEXUxobYI/RxULIzOoIP7pgfDd4p1cw= github.com/ethantkoenig/rupture v0.0.0-20181029165146-c3b3b810dc77/go.mod h1:MkKY/CB98aVE4VxO63X5vTQKUgcn+3XP15LMASe3lYs= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= @@ -655,6 +656,7 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= +github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 h1:g0fAGBisHaEQ0TRq1iBvemFRf+8AEWEmBESSiWB3Vsc= github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -684,6 +686,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= @@ -1025,6 +1028,7 @@ github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/steveyen/gtreap v0.1.0 h1:CjhzTa274PyJLJuMZwIzCO1PfC00oRa8d1Kc78bFXJM= github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= @@ -1069,6 +1073,7 @@ github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnl github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6/go.mod h1:+5rDk6sDGpl3azws3O+f+GpFSyN9GVr0K8cvQLQM2ZQ= github.com/unknwon/i18n v0.0.0-20200823051745-09abd91c7f2c h1:679/gJXwrsHC3RATr0YYjZvDMJPYN7W9FGSGNoLmKxM= github.com/unknwon/i18n v0.0.0-20200823051745-09abd91c7f2c/go.mod h1:+5rDk6sDGpl3azws3O+f+GpFSyN9GVr0K8cvQLQM2ZQ= +github.com/unknwon/paginater v0.0.0-20200328080006-042474bd0eae h1:ihaXiJkaca54IaCSnEXtE/uSZOmPxKZhDfVLrzZLFDs= github.com/unknwon/paginater v0.0.0-20200328080006-042474bd0eae/go.mod h1:1fdkY6xxl6ExVs2QFv7R0F5IRZHKA8RahhB9fMC9RvM= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= diff --git a/models/issue.go b/models/issue.go index 2337c05344f2c..81fdee2becc43 100644 --- a/models/issue.go +++ b/models/issue.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs" @@ -63,6 +64,7 @@ type Issue struct { Reactions ReactionList `xorm:"-"` TotalTrackedTime int64 `xorm:"-"` Assignees []*User `xorm:"-"` + ProjectIssueID ProjectIssue // IsLocked limits commenting abilities to users on an issue // with write access @@ -1100,9 +1102,10 @@ type IssuesOptions struct { ExcludedLabelNames []string SortType string IssueIDs []int64 - NotInProjectID int64 + ExcludeProjectID int64 // prioritize issues from this repo - PriorityRepoID int64 + PriorityRepoID int64 + RenderEmojiTitle util.OptionalBool } // sortIssuesSession sort an issues-related session based on the provided @@ -1181,20 +1184,19 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) { if opts.ProjectID > 0 { sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). - And("project_issue.project_id=?", opts.ProjectID).OrderBy("priority") + And("project_issue.project_id=?", opts.ProjectID).OrderBy("`project_issue`.priority") } + if opts.ProjectBoardID != 0 { if opts.ProjectBoardID > 0 { - sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}).OrderBy("priority")) + sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}).OrderBy("`project_issue`.priority")) } else { - sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).OrderBy("priority")) + sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).OrderBy("`project_issue`.priority")) } } - if opts.NotInProjectID != 0 { - if opts.NotInProjectID > 0 { - sess.NotIn("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_id": opts.NotInProjectID}).OrderBy("priority")) - } + if opts.ExcludeProjectID != 0 { + sess.NotIn("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_id": opts.ExcludeProjectID}).OrderBy("`project_issue`.priority")) } switch opts.IsPull { @@ -1286,7 +1288,15 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) { if err := IssueList(issues).LoadAttributes(); err != nil { return nil, fmt.Errorf("LoadAttributes: %v", err) } - + if opts.RenderEmojiTitle == util.OptionalBoolTrue { + var issuesWithEmojis []*Issue + for _, issue := range issues { + title := string(markup.RenderEmoji(issue.Title)) + issue.Title = title + issuesWithEmojis = append(issuesWithEmojis, issue) + } + return issuesWithEmojis, nil + } return issues, nil } diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 4715f192c157e..26c09e5541af5 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -252,6 +252,8 @@ var migrations = []Migration{ NewMigration("ensure repo topics are up-to-date", fixRepoTopics), // v158 -> v159 NewMigration("code comment replies should have the commitID of the review they are replying to", updateCodeCommentReplies), + // v159 -> v160 + NewMigration("Add projects boards and issues priorities", addProjectsIssuesBoardsPriority), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v159.go b/models/migrations/v159.go new file mode 100644 index 0000000000000..7e83abb069ffb --- /dev/null +++ b/models/migrations/v159.go @@ -0,0 +1,26 @@ +// Copyright 2020 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 migrations + +import ( + "xorm.io/xorm" +) + +func addProjectsIssuesBoardsPriority(x *xorm.Engine) error { + // ProjectIssue saves relation from issue to a project + type ProjectIssue struct { + Priority int `xorm:"NOT NULL DEFAULT 0"` + } + + if err := x.Sync2(new(ProjectIssue)); err != nil { + return err + } + + type ProjectBoard struct { + Priority int `xorm:"NOT NULL DEFAULT 0"` + } + + return x.Sync2(new(ProjectBoard)) +} diff --git a/models/project.go b/models/project.go index a34ccfeab49df..0afa72753f2db 100644 --- a/models/project.go +++ b/models/project.go @@ -308,50 +308,23 @@ func deleteProjectByID(e Engine, id int64) error { return updateRepositoryProjectCount(e, p.RepoID) } -// Update given boards priority for a project -func UpdateBoards(boards []ProjectBoard) error { - for _, board := range boards { - if _, err := x.ID(board.ID).Cols("priority").Update(&board); err != nil { - log.Info("failed updating board priorities %s", err) - return err - } - - } - return nil +// LoadRepository loads repository of a given project +func (p *Project) LoadRepository() error { + return p.loadRepository(x) } -// Update given issue priority and column -func UpdateBoardIssues(issues []ProjectIssue) (error, []ProjectIssue) { - var updatedIssues []ProjectIssue - for _, pissue := range issues { - if pissue.ID != 0 { - if _, err := x.ID(pissue.ID).Cols("priority", "project_board_id").Update(&pissue); err != nil { - log.Info("failed updating cards priorities %s", err) - return err, updatedIssues - } else { - updatedIssues = append(updatedIssues, pissue) - } - } else { - if _, err := x.Insert(&pissue); err != nil { - log.Info("failed inserting cards priorities %s", err) - return err, updatedIssues - } else { - updatedIssues = append(updatedIssues, pissue) - } - } +// loadRepository loads repository of a given project +func (p *Project) loadRepository(e Engine) error { + if p.Repo != nil { + return nil } - return nil, updatedIssues -} - -func (p *Project) LoadRepository() error { - var repo = Repository{} if p.Type == ProjectTypeRepository { - _, err := x.ID(p.RepoID).Get(&repo) - p.Repo = &repo - if err != nil { - log.Info("failed getting repo %w", err) + repo := &Repository{} + if _, err := e.ID(p.RepoID).Get(repo); err != nil { + log.Info("failed getting repo %v", err) + return err } - return err + p.Repo = repo } return nil } diff --git a/models/project_board.go b/models/project_board.go index 80be9f89d5f68..914d0d0857851 100644 --- a/models/project_board.go +++ b/models/project_board.go @@ -36,7 +36,7 @@ type ProjectBoard struct { ID int64 `xorm:"pk autoincr"` Title string Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board - Priority int + Priority int `xorm:"NOT NULL DEFAULT 0"` ProjectID int64 `xorm:"INDEX NOT NULL"` CreatorID int64 `xorm:"NOT NULL"` @@ -190,7 +190,7 @@ func GetUncategorizedBoard(projectID int64) (*ProjectBoard, error) { }, nil } -// LoadIssues load issues assigned to this board +// LoadProjectIssues load project issues assigned to this board func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) { var boardID int64 if !b.Default { @@ -200,25 +200,27 @@ func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) { // Issues without ProjectBoardID boardID = 0 } - var projectIssuesDB []*ProjectIssue var projectIssues []*ProjectIssue - err := x.Table("project_issue").Where("project_board_id = ? and project_id =?", - boardID, b.ProjectID). - OrderBy("priority").Find(&projectIssuesDB) - for _, projectIssue := range projectIssuesDB { - if issue, err := getIssueByID(x, projectIssue.IssueID); err != nil { - log.Info("failed getting projectIssue's issue %v\n", err) - } else { - issue.LoadLabels() - issue.LoadMilestone() - issue.loadAssignees(x) - projectIssue.Issue = issue - projectIssues = append(projectIssues, projectIssue) - } + var issues []*Issue + if err := x.Table("issue"). + Cols("issue.id, issue.repo_id, issue.index, issue.poster_id,issue.name,issue.milestone_id,issue.is_closed,issue.is_pull,issue.created_unix,issue.updated_unix, project_issue.id as project_issue_id, project_issue.project_id as project_issue_project_id, project_issue.project_board_id as project_issue_project_board_id"). + Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). + Where("project_board_id = ? and project_id =?", + boardID, b.ProjectID). + OrderBy("`project_issue`.priority").Find(&issues); err != nil { + log.Error("LoadAttributes: %v", err) + } + + if err := IssueList(issues).LoadAttributes(); err != nil { + log.Error("LoadAttributes: %v", err) } - b.ProjectIssues = projectIssues - return projectIssues, err + for _, issue := range issues { + projectIssue := issue.ProjectIssueID + projectIssue.Issue = issue + projectIssues = append(projectIssues, &projectIssue) + } + return projectIssues, nil } // LoadIssues load issues assigned to the boards @@ -232,3 +234,19 @@ func (bs ProjectBoardList) LoadIssues() error { } return nil } + +// UpdateBoardsPriority updates boards priority for a project +func UpdateBoardsPriority(boards []ProjectBoard) error { + sess := x.NewSession() + if err := sess.Begin(); err != nil { + return err + } + defer sess.Close() + for _, board := range boards { + if _, err := sess.ID(board.ID).Cols("priority").Update(&board); err != nil { + log.Info("failed updating board priorities %s", err) + return err + } + } + return sess.Commit() +} diff --git a/models/project_issue.go b/models/project_issue.go index 5fd7a4cc9c55e..a744bd5cfe444 100644 --- a/models/project_issue.go +++ b/models/project_issue.go @@ -8,18 +8,17 @@ import ( "fmt" "code.gitea.io/gitea/modules/log" + "xorm.io/xorm" ) // ProjectIssue saves relation from issue to a project type ProjectIssue struct { - ID int64 `xorm:"pk autoincr"` - IssueID int64 `xorm:"INDEX"` - ProjectID int64 `xorm:"INDEX"` - IssueTitle string `xorm:"-"` - IssueIsPull bool `xorm:"-"` - Priority int - Issue *Issue `xorm:"-"` + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"INDEX"` + ProjectID int64 `xorm:"INDEX"` + Priority int `xorm:"NOT NULL DEFAULT 0"` + Issue *Issue `xorm:"-"` // If 0, then it has not been added to a specific board in the project ProjectBoardID int64 `xorm:"INDEX"` @@ -69,12 +68,12 @@ func (i *Issue) projectID(e Engine) int64 { return ip.ProjectID } -// ProjectBoardID return project board id if issue was assigned to one -func (i *Issue) ProjectBoardID() int64 { - return i.projectBoardID(x) +// LoadProjectBoardID return project board id if issue was assigned to one +func (i *Issue) LoadProjectBoardID() int64 { + return i.loadProjectBoardID(x) } -func (i *Issue) projectBoardID(e Engine) int64 { +func (i *Issue) loadProjectBoardID(e Engine) int64 { var ip ProjectIssue has, err := e.Where("issue_id=?", i.ID).Get(&ip) if err != nil || !has { @@ -146,7 +145,6 @@ func ChangeProjectAssign(issue *Issue, doer *User, newProjectID int64) error { func addUpdateIssueProject(e *xorm.Session, issue *Issue, doer *User, newProjectID int64) error { oldProjectID := issue.projectID(e) if _, err := e.Where("project_issue.issue_id=?", issue.ID).Delete(&ProjectIssue{}); err != nil { - log.Info("failed deleting project issue %w", err) return err } @@ -222,3 +220,36 @@ func (pb *ProjectBoard) removeIssues(e Engine) error { _, err := e.Exec("UPDATE `project_issue` SET project_board_id = 0 WHERE project_board_id = ? ", pb.ID) return err } + +// UpdateBoardIssuesPriority update given board issue priority +func UpdateBoardIssuesPriority(issues []ProjectIssue) ([]ProjectIssue, error) { + sess := x.NewSession() + if err := sess.Begin(); err != nil { + var updatedIssues []ProjectIssue + return updatedIssues, err + } + defer sess.Close() + var updatedIssues []ProjectIssue + for _, pissue := range issues { + if pissue.ID != 0 { + if _, err := sess.ID(pissue.ID).Cols("priority", "project_board_id").Update(&pissue); err != nil { + log.Info("failed updating cards priorities %s", err) + return updatedIssues, err + } + updatedIssues = append(updatedIssues, pissue) + } else { + var existingIssue ProjectIssue + if found, err := sess.Where("issue_id = ? and project_id = ?", pissue.IssueID, pissue.ProjectID). + Get(&existingIssue); err != nil { + log.Error("failed finding issue %s", err) + } else if !found { + if _, err := sess.Insert(&pissue); err != nil { + log.Info("failed inserting cards priorities %s", err) + return updatedIssues, err + } + updatedIssues = append(updatedIssues, pissue) + } + } + } + return updatedIssues, sess.Commit() +} diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 806cf1b2e42b7..8da91e616fb53 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -762,7 +762,7 @@ func (f *DeadlineForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi // UpdateBoardPriorityForm form for updating cards on drag and drop type UpdateBoardPriorityForm struct { - Boards []models.ProjectBoard `form:"boards" json:"boards"` + Boards []models.ProjectBoard } // Validate validates the fields diff --git a/modules/markup/html.go b/modules/markup/html.go index f5f811b59b6fc..05a5c5c760b0e 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -7,6 +7,7 @@ package markup import ( "bytes" "fmt" + "html/template" "net/url" "path" "path/filepath" @@ -287,9 +288,19 @@ func RenderDescriptionHTML( return ctx.postProcess(rawHTML) } +// RenderEmoji renders html text with emoji post processors +func RenderEmoji(text string) template.HTML { + renderedText, err := renderEmoji([]byte(template.HTMLEscapeString(text))) + if err != nil { + log.Error("RenderEmoji: %v", err) + return template.HTML("") + } + return template.HTML(renderedText) +} + // RenderEmoji for when we want to just process emoji and shortcodes // in various places it isn't already run through the normal markdown procesor -func RenderEmoji( +func renderEmoji( rawHTML []byte, ) ([]byte, error) { ctx := &postProcessCtx{ diff --git a/modules/templates/helper.go b/modules/templates/helper.go index e4107dfa9a10d..378154e4857f5 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -154,7 +154,7 @@ func NewFuncMap() []template.FuncMap { "RenderCommitMessageLink": RenderCommitMessageLink, "RenderCommitMessageLinkSubject": RenderCommitMessageLinkSubject, "RenderCommitBody": RenderCommitBody, - "RenderEmoji": RenderEmoji, + "RenderEmoji": markup.RenderEmoji, "RenderEmojiPlain": emoji.ReplaceAliases, "ReactionToEmoji": ReactionToEmoji, "RenderNote": RenderNote, @@ -369,7 +369,7 @@ func NewFuncMap() []template.FuncMap { for _, label := range labels { html = fmt.Sprintf("%s
%s
", - html, label.ForegroundColor(), label.Color, RenderEmoji(label.Name)) + html, label.ForegroundColor(), label.Color, markup.RenderEmoji(label.Name)) } return template.HTML(html) @@ -632,16 +632,6 @@ func RenderCommitBody(msg, urlPrefix string, metas map[string]string) template.H return template.HTML(renderedMessage) } -// RenderEmoji renders html text with emoji post processors -func RenderEmoji(text string) template.HTML { - renderedText, err := markup.RenderEmoji([]byte(template.HTMLEscapeString(text))) - if err != nil { - log.Error("RenderEmoji: %v", err) - return template.HTML("") - } - return template.HTML(renderedText) -} - //ReactionToEmoji renders emoji for use in reactions func ReactionToEmoji(reaction string) template.HTML { val := emoji.FromCode(reaction) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index fdec75b21b0bd..afbbff211640c 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -51,7 +51,7 @@ func SearchIssues(ctx *context.APIContext) { // description: repository to prioritize in the results // type: integer // format: int64 - // - name: not_in_project_id + // - name: exclude_project_id // in: query // description: project to exclude from search when searching issues to add to a project // type: integer @@ -64,6 +64,10 @@ func SearchIssues(ctx *context.APIContext) { // in: query // description: page number of requested issues // type: integer + // - name: render_emoji_title + // in: query + // description: render emojis in issue title + // type: string // responses: // "200": // "$ref": "#/responses/IssueList" @@ -78,6 +82,16 @@ func SearchIssues(ctx *context.APIContext) { isClosed = util.OptionalBoolFalse } + var renderEmojiTitle util.OptionalBool + switch ctx.Query("render_emoji_title") { + case "true": + renderEmojiTitle = util.OptionalBoolTrue + case "false": + renderEmojiTitle = util.OptionalBoolFalse + default: + renderEmojiTitle = util.OptionalBoolFalse + } + // find repos user can access (for issue search) repoIDs := make([]int64, 0) opts := &models.SearchRepoOptions{ @@ -163,7 +177,8 @@ func SearchIssues(ctx *context.APIContext) { SortType: "priorityrepo", PriorityRepoID: ctx.QueryInt64("priority_repo_id"), IsPull: isPull, - NotInProjectID: ctx.QueryInt64("not_in_project_id"), + ExcludeProjectID: ctx.QueryInt64("exclude_project_id"), + RenderEmojiTitle: renderEmojiTitle, } if issues, err = models.Issues(issuesOpt); err != nil { @@ -234,6 +249,10 @@ func ListIssues(ctx *context.APIContext) { // in: query // description: page size of results // type: integer + // - name: render_emoji_title + // in: query + // description: render emojis in issue title + // type: string // responses: // "200": // "$ref": "#/responses/IssueList" @@ -248,6 +267,16 @@ func ListIssues(ctx *context.APIContext) { isClosed = util.OptionalBoolFalse } + var renderEmojiTitle util.OptionalBool + switch ctx.Query("render_emoji_title") { + case "true": + renderEmojiTitle = util.OptionalBoolTrue + case "false": + renderEmojiTitle = util.OptionalBoolFalse + default: + renderEmojiTitle = util.OptionalBoolFalse + } + var issues []*models.Issue var filteredCount int64 @@ -320,14 +349,15 @@ func ListIssues(ctx *context.APIContext) { // This would otherwise return all issues if no issues were found by the search. if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { issuesOpt := &models.IssuesOptions{ - ListOptions: listOptions, - RepoIDs: []int64{ctx.Repo.Repository.ID}, - IsClosed: isClosed, - IssueIDs: issueIDs, - LabelIDs: labelIDs, - MilestoneIDs: mileIDs, - IsPull: isPull, - NotInProjectID: ctx.QueryInt64("not_in_project_id"), + ListOptions: listOptions, + RepoIDs: []int64{ctx.Repo.Repository.ID}, + IsClosed: isClosed, + IssueIDs: issueIDs, + LabelIDs: labelIDs, + MilestoneIDs: mileIDs, + IsPull: isPull, + ExcludeProjectID: ctx.QueryInt64("exclude_project_id"), + RenderEmojiTitle: renderEmojiTitle, } if issues, err = models.Issues(issuesOpt); err != nil { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 1932cee92239d..86a5032b8e477 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -44,11 +44,11 @@ const ( tplIssueChoose base.TplName = "repo/issue/choose" tplIssueView base.TplName = "repo/issue/view" + tplSidebar base.TplName = "repo/issue/view_content/sidebar" tplReactions base.TplName = "repo/issue/view_content/reactions" issueTemplateKey = "IssueTemplate" issueTemplateTitleKey = "IssueTemplateTitle" - tplSidebar = "repo/issue/view_content/sidebar" ) var ( @@ -1488,7 +1488,7 @@ func ViewIssue(ctx *context.Context) { ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons ctx.Data["RefEndName"] = git.RefEndName(issue.Ref) - if ctx.Params(":sidebar") == "true" { + if ctx.Query("sidebar") == "true" { ctx.Data["Sidebar"] = true ctx.HTML(200, tplSidebar) } else { diff --git a/routers/repo/projects.go b/routers/repo/projects.go index 3c75f387e5ab6..e172c37060c9d 100644 --- a/routers/repo/projects.go +++ b/routers/repo/projects.go @@ -287,7 +287,6 @@ func ViewProject(ctx *context.Context) { allBoards := models.ProjectBoardList{uncategorizedBoard} allBoards = append(allBoards, boards...) - if err = allBoards.LoadIssues(); err != nil { ctx.ServerError("LoadIssuesOfBoards", err) return @@ -300,7 +299,9 @@ func ViewProject(ctx *context.Context) { ctx.Data["Boards"] = allBoards ctx.Data["PageIsProjects"] = true ctx.Data["RequiresDraggable"] = true - project.LoadRepository() + if err := project.LoadRepository(); err != nil { + log.Error("failed loading project's repo %v\n", err) + } if project.Repo != nil && project.Repo.ID != 0 { ctx.Data["Repo"] = project.Repo } @@ -615,7 +616,11 @@ func UpdateBoardsPriorityPost(ctx *context.Context, form auth.UpdateBoardPriorit } boards := form - models.UpdateBoards(form.Boards) + if err := models.UpdateBoardsPriority(form.Boards); err != nil { + log.Error("failed updating boards %v", err) + ctx.JSON(500, err) + return + } ctx.JSON(200, boards) } @@ -629,9 +634,9 @@ func UpdateBoardIssuePriority(ctx *context.Context, form auth.UpdateIssuePriorit return } - err, issues := models.UpdateBoardIssues(form.Issues) + issues, err := models.UpdateBoardIssuesPriority(form.Issues) if err != nil { - log.Info("failed updating issues %v", err) + log.Error("failed updating issues %v", err) } ctx.JSON(200, issues) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 98dd34341e672..e3b51b18c6043 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -940,7 +940,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("", func() { m.Get("/^:type(issues|pulls)$", repo.Issues) m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue) - m.Get("/^:type(issues|pulls)$/:index/sidebar/:sidebar", repo.ViewIssue) m.Get("/labels/", reqRepoIssuesOrPullsReader, repo.RetrieveLabels, repo.Labels) m.Get("/milestones", reqRepoIssuesOrPullsReader, repo.Milestones) }, context.RepoRef()) @@ -957,11 +956,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/edit", repo.EditProject) m.Post("/edit", bindIgnErr(auth.CreateProjectForm{}), repo.EditProjectPost) - m.Put("/updateIssuesPriorities", bindIgnErr(auth.UpdateIssuePriorityBoardForm{}), repo.UpdateBoardIssuePriority) + m.Put("/issue/priority", bindIgnErr(auth.UpdateIssuePriorityBoardForm{}), repo.UpdateBoardIssuePriority) m.Post("/^:action(open|close)$", repo.ChangeProjectStatus) m.Group("/:boardID", func() { - m.Put("updatePriorities", bindIgnErr(auth.UpdateBoardPriorityForm{}), repo.UpdateBoardsPriorityPost) + m.Put("board/priority", bindIgnErr(auth.UpdateBoardPriorityForm{}), repo.UpdateBoardsPriorityPost) m.Put("", bindIgnErr(auth.EditProjectBoardTitleForm{}), repo.EditProjectBoardTitle) m.Delete("", repo.DeleteProjectBoard) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 93f7565fd1cdb..742e11ff68efc 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -1,8 +1,8 @@
- {{if eq .Sidebar true}} -

#{{.Issue.Index}} {{.Issue.Title}}

- {{end}} + {{if .Sidebar}} +

#{{.Issue.Index}} {{RenderEmoji .Issue.Title}}

+ {{end}} {{template "repo/issue/branch_selector_field" .}} {{if .Issue.IsPull }} @@ -226,7 +226,7 @@ {{end}}
-
+
{{.i18n.Tr "repo.issues.new.no_projects"}}
{{if .Issue.ProjectID}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 4f44d2cb16336..c2d7bdd60ccfe 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -11,14 +11,14 @@
{{if and .CanWriteProjects (not .Repository.IsArchived) .PageIsProjects}} - - + + {{end}}