From e06acf43580adc81e0ece46f17888450a4405f54 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Mon, 12 Dec 2022 06:27:56 -0800 Subject: [PATCH 01/22] Preview images for Issue cards in Project Board view --- models/repo/attachment.go | 15 +++++++++++++++ routers/web/repo/projects.go | 11 +++++++++++ templates/repo/projects/view.tmpl | 5 +++++ web_src/less/_base.less | 2 +- web_src/less/features/projects.less | 19 +++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index 8fbf79a7a053a..6db42cf51e9bf 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -132,6 +132,21 @@ func GetAttachmentsByIssueID(ctx context.Context, issueID int64) ([]*Attachment, return attachments, db.GetEngine(ctx).Where("issue_id = ? AND comment_id = 0", issueID).Find(&attachments) } +// GetAttachmentsByIssueIDImagesLatest returns the latest image attachments of an issue. +func GetAttachmentsByIssueIDImagesLatest(ctx context.Context, issueID int64) ([]*Attachment, error) { + attachments := make([]*Attachment, 0, 10) + return attachments, db.GetEngine(ctx).Where(`issue_id = ? AND (name like '%.apng' + OR name like '%.avif' + OR name like '%.bmp' + OR name like '%.gif' + OR name like '%.jpg' + OR name like '%.jpeg' + OR name like '%.jxl' + OR name like '%.png' + OR name like '%.svg' + OR name like '%.webp')`, issueID).Desc("comment_id").Limit(5).Find(&attachments) +} + // GetAttachmentsByCommentID returns all attachments if comment by given ID. func GetAttachmentsByCommentID(ctx context.Context, commentID int64) ([]*Attachment, error) { attachments := make([]*Attachment, 0, 10) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 75cd290b8f0cb..420b708a8e266 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -13,6 +13,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/perm" project_model "code.gitea.io/gitea/models/project" + attachment_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" @@ -302,6 +303,16 @@ func ViewProject(ctx *context.Context) { return } + issuesAttachmentMap := make(map[int64][]*attachment_model.Attachment) + for _, issuesList := range issuesMap { + for _, issue := range issuesList { + if issueAttachment, err := attachment_model.GetAttachmentsByIssueIDImagesLatest(ctx, issue.ID); err == nil { + issuesAttachmentMap[issue.ID] = issueAttachment + } + } + } + ctx.Data["issuesAttachmentMap"] = issuesAttachmentMap + linkedPrsMap := make(map[int64][]*issues_model.Issue) for _, issuesList := range issuesMap { for _, issue := range issuesList { diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 262efd2e0e800..b84edd12089c7 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -179,6 +179,11 @@
+
+ {{range (index $.issuesAttachmentMap .ID)}} + {{.Name}} + {{end}} +
diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 022afcea927e7..ef2f97defbc91 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -980,7 +980,7 @@ a.commit-statuses-trigger { .ui.cards > .card > .content, .ui.card > .content { - border-color: var(--color-secondary); + border: none; } .ui.cards > .card > .extra, diff --git a/web_src/less/features/projects.less b/web_src/less/features/projects.less index 21514688b6fca..b8390247fc4fc 100644 --- a/web_src/less/features/projects.less +++ b/web_src/less/features/projects.less @@ -89,6 +89,25 @@ font-size: 16px !important; } +.board-card .card-attachment-image { + display: inline-block; + white-space: nowrap; + overflow: hidden; + text-align: center; +} + +.board-card .card-attachment-image img { + display: inline-block; + max-height: 50px; + border-radius: var(--border-radius); + margin-right: 2px; +} + +.board-card .card-attachment-image img:only-child { + max-height: 90px; + margin: auto; +} + .card-ghost { border-style: dashed !important; background: none !important; From 0afe78415a7c08cad1b7fab9e7867f8075f2975e Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Mon, 12 Dec 2022 06:40:11 -0800 Subject: [PATCH 02/22] Preview images for Issue cards in Project Board view --- templates/repo/projects/view.tmpl | 2 +- web_src/less/features/projects.less | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index b84edd12089c7..2ffe10e05a606 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -179,7 +179,7 @@
-
+
{{range (index $.issuesAttachmentMap .ID)}} {{.Name}} {{end}} diff --git a/web_src/less/features/projects.less b/web_src/less/features/projects.less index b8390247fc4fc..3c157691bab96 100644 --- a/web_src/less/features/projects.less +++ b/web_src/less/features/projects.less @@ -89,21 +89,21 @@ font-size: 16px !important; } -.board-card .card-attachment-image { +.board-card .card-attachment-images { display: inline-block; white-space: nowrap; overflow: hidden; text-align: center; } -.board-card .card-attachment-image img { +.board-card .card-attachment-images img { display: inline-block; max-height: 50px; border-radius: var(--border-radius); margin-right: 2px; } -.board-card .card-attachment-image img:only-child { +.board-card .card-attachment-images img:only-child { max-height: 90px; margin: auto; } From a3fcf656a1657bbbab7118c4bdf91fd6570082ac Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Wed, 14 Dec 2022 17:21:59 -0800 Subject: [PATCH 03/22] More specific selector for cleaned up card CSS. --- web_src/less/_base.less | 2 +- web_src/less/features/projects.less | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index ef2f97defbc91..022afcea927e7 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -980,7 +980,7 @@ a.commit-statuses-trigger { .ui.cards > .card > .content, .ui.card > .content { - border: none; + border-color: var(--color-secondary); } .ui.cards > .card > .extra, diff --git a/web_src/less/features/projects.less b/web_src/less/features/projects.less index 3c157691bab96..7be222890c4e1 100644 --- a/web_src/less/features/projects.less +++ b/web_src/less/features/projects.less @@ -71,6 +71,10 @@ margin-right: auto !important; } +.board-column .ui.cards > .card > .content { + border: none; +} + .board-card { margin: 4px 2px !important; border-radius: 5px !important; From 3745fc3421b5e4f01f822f546b93961706ee1af7 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Thu, 15 Dec 2022 12:25:52 -0800 Subject: [PATCH 04/22] Added Project option to change Card Type (Image Previews vs Text Only) --- models/project/board.go | 22 ++++++++++++++++++ models/project/project.go | 38 +++++++++++++++++++++++++------ models/project/project_test.go | 1 + options/locale/locale_en-US.ini | 3 +++ routers/web/repo/projects.go | 15 +++++++++--- services/forms/repo_form.go | 2 ++ templates/repo/projects/new.tmpl | 33 ++++++++++++++++++++++----- templates/repo/projects/view.tmpl | 6 +++-- templates/user/project.tmpl | 2 +- 9 files changed, 103 insertions(+), 19 deletions(-) diff --git a/models/project/board.go b/models/project/board.go index d8468f0cb55c6..9b54bbfd136cb 100644 --- a/models/project/board.go +++ b/models/project/board.go @@ -19,6 +19,9 @@ type ( // BoardType is used to represent a project board type BoardType uint8 + // CardType is used to represent a project board card type + CardType uint8 + // BoardList is a list of all project boards in a repository BoardList []*Board ) @@ -34,6 +37,15 @@ const ( BoardTypeBugTriage ) +const ( + // CardTypeTextOnly is a project board card type that is text only + CardTypeTextOnly CardType = iota + 1 + + // CardTypeImagesAndText is a project board card type that has images and text + CardTypeImagesAndText +) + + // BoardColorPattern is a regexp witch can validate BoardColor var BoardColorPattern = regexp.MustCompile("^#[0-9a-fA-F]{6}$") @@ -85,6 +97,16 @@ func IsBoardTypeValid(p BoardType) bool { } } +// IsCardTypeValid checks if the project board card type is valid +func IsCardTypeValid(p CardType) bool { + switch p { + case CardTypeTextOnly, CardTypeImagesAndText: + return true + default: + return false + } +} + func createBoardsForProjectsType(ctx context.Context, project *Project) error { var items []string diff --git a/models/project/project.go b/models/project/project.go index bcf1166408f85..2c8dda3a36b77 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -17,10 +17,16 @@ import ( ) type ( - // ProjectsConfig is used to identify the type of board that is being created - ProjectsConfig struct { - BoardType BoardType - Translation string + // BoardConfig is used to identify the type of board that is being created + BoardConfig struct { + BoardType BoardType + Translation string + } + + // CardConfig is used to identify the type of board card that is being used + CardConfig struct { + CardType CardType + Translation string } // Type is used to identify the type of project in question and ownership @@ -86,6 +92,7 @@ type Project struct { CreatorID int64 `xorm:"NOT NULL"` IsClosed bool `xorm:"INDEX"` BoardType BoardType + CardType CardType Type Type RenderedContent string `xorm:"-"` @@ -99,15 +106,23 @@ func init() { db.RegisterModel(new(Project)) } -// GetProjectsConfig retrieves the types of configurations projects could have -func GetProjectsConfig() []ProjectsConfig { - return []ProjectsConfig{ +// GetBoardConfig retrieves the types of configurations project boards could have +func GetBoardConfig() []BoardConfig { + return []BoardConfig{ {BoardTypeNone, "repo.projects.type.none"}, {BoardTypeBasicKanban, "repo.projects.type.basic_kanban"}, {BoardTypeBugTriage, "repo.projects.type.bug_triage"}, } } +// GetCardConfig retrieves the types of configurations project board cards could have +func GetCardConfig() []CardConfig { + return []CardConfig{ + {CardTypeTextOnly, "repo.projects.card_type.text_only"}, + {CardTypeImagesAndText, "repo.projects.card_type.images_and_text"}, + } +} + // IsTypeValid checks if a project type is valid func IsTypeValid(p Type) bool { switch p { @@ -175,6 +190,10 @@ func NewProject(p *Project) error { p.BoardType = BoardTypeNone } + if !IsCardTypeValid(p.CardType) { + p.CardType = CardTypeTextOnly + } + if !IsTypeValid(p.Type) { return errors.New("project type is not valid") } @@ -216,9 +235,14 @@ func GetProjectByID(ctx context.Context, id int64) (*Project, error) { // UpdateProject updates project properties func UpdateProject(ctx context.Context, p *Project) error { + if !IsCardTypeValid(p.CardType) { + p.CardType = CardTypeTextOnly + } + _, err := db.GetEngine(ctx).ID(p.ID).Cols( "title", "description", + "card_type", ).Update(p) return err } diff --git a/models/project/project_test.go b/models/project/project_test.go index 4fde0fc7ce3a4..3d89aa55a27ec 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -53,6 +53,7 @@ func TestProject(t *testing.T) { project := &Project{ Type: TypeRepository, BoardType: BoardTypeBasicKanban, + CardType: CardTypeTextOnly, Title: "New Project", RepoID: 1, CreatedUnix: timeutil.TimeStampNow(), diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 70f982b8dcc59..3e2afe87806f8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1219,6 +1219,9 @@ projects.board.color = "Color" projects.open = Open projects.close = Close projects.board.assigned_to = Assigned to +projects.card_type.desc = "Card Previews" +projects.card_type.images_and_text = "Images and Text" +projects.card_type.text_only = "Text Only" issues.desc = Organize bug reports, tasks and milestones. issues.filter_assignees = Filter Assignee diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 420b708a8e266..a7dc233d025ec 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -124,7 +124,8 @@ func Projects(ctx *context.Context) { // NewProject render creating a project page func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") - ctx.Data["ProjectTypes"] = project_model.GetProjectsConfig() + ctx.Data["BoardTypes"] = project_model.GetBoardConfig() + ctx.Data["CardTypes"] = project_model.GetCardConfig() ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -136,7 +137,8 @@ func NewProjectPost(ctx *context.Context) { if ctx.HasError() { ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) - ctx.Data["ProjectTypes"] = project_model.GetProjectsConfig() + ctx.Data["BoardTypes"] = project_model.GetBoardConfig() + ctx.Data["CardTypes"] = project_model.GetCardConfig() ctx.HTML(http.StatusOK, tplProjectsNew) return } @@ -147,6 +149,7 @@ func NewProjectPost(ctx *context.Context) { Description: form.Content, CreatorID: ctx.Doer.ID, BoardType: form.BoardType, + CardType: form.CardType, Type: project_model.TypeRepository, }); err != nil { ctx.ServerError("NewProject", err) @@ -213,6 +216,7 @@ func EditProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.edit") ctx.Data["PageIsEditProjects"] = true ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) + ctx.Data["CardTypes"] = project_model.GetCardConfig() p, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id")) if err != nil { @@ -230,6 +234,7 @@ func EditProject(ctx *context.Context) { ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description + ctx.Data["card_type"] = p.CardType ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -240,6 +245,7 @@ func EditProjectPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.edit") ctx.Data["PageIsEditProjects"] = true ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) + ctx.Data["CardTypes"] = project_model.GetCardConfig() if ctx.HasError() { ctx.HTML(http.StatusOK, tplProjectsNew) @@ -262,6 +268,7 @@ func EditProjectPost(ctx *context.Context) { p.Title = form.Title p.Description = form.Content + p.CardType = form.CardType if err = project_model.UpdateProject(ctx, p); err != nil { ctx.ServerError("UpdateProjects", err) return @@ -668,7 +675,8 @@ func MoveIssues(ctx *context.Context) { // CreateProject renders the generic project creation page func CreateProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") - ctx.Data["ProjectTypes"] = project_model.GetProjectsConfig() + ctx.Data["BoardTypes"] = project_model.GetBoardConfig() + ctx.Data["CardTypes"] = project_model.GetCardConfig() ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.HTML(http.StatusOK, tplGenericProjectsNew) @@ -699,6 +707,7 @@ func CreateProjectPost(ctx *context.Context, form forms.UserCreateProjectForm) { Description: form.Content, CreatorID: user.ID, BoardType: form.BoardType, + CardType: form.CardType, Type: projectType, }); err != nil { ctx.ServerError("NewProject", err) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 89a013d9af8d0..093bc8cd284d7 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -510,6 +510,7 @@ type CreateProjectForm struct { Title string `binding:"Required;MaxSize(100)"` Content string BoardType project_model.BoardType + CardType project_model.CardType } // UserCreateProjectForm is a from for creating an individual or organization @@ -518,6 +519,7 @@ type UserCreateProjectForm struct { Title string `binding:"Required;MaxSize(100)"` Content string BoardType project_model.BoardType + CardType project_model.CardType UID int64 `binding:"Required"` } diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index 5edca90886bc6..801b5bb41af88 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -34,17 +34,38 @@
{{if not .PageIsEditProjects}} - +
+ +
+ +
{{.locale.Tr "repo.projects.template.desc_helper"}}
+
+ {{range $element := .BoardTypes}} +
{{$.locale.Tr $element.Translation}}
+ {{end}} +
+
+
+ {{end}} + +
+
- -
{{.locale.Tr "repo.projects.template.desc_helper"}}
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{range $element := .CardTypes}} + {{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2)) }} + +
{{$.locale.Tr $element.Translation}}
+ {{end}} + {{end}}
- {{range $element := .ProjectTypes}} -
{{$.locale.Tr $element.Translation}}
+ {{range $element := .CardTypes}} +
{{$.locale.Tr $element.Translation}}
{{end}}
- {{end}} +
+
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 2ffe10e05a606..64813dcbcc226 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -180,8 +180,10 @@
- {{range (index $.issuesAttachmentMap .ID)}} - {{.Name}} + {{if eq $.Project.CardType 2}} + {{range (index $.issuesAttachmentMap .ID)}} + {{.Name}} + {{end}} {{end}}
diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl index d38d84d95cfb7..916bbaec617ef 100644 --- a/templates/user/project.tmpl +++ b/templates/user/project.tmpl @@ -48,7 +48,7 @@
{{.locale.Tr "repo.projects.template.desc_helper"}}
- {{range $element := .ProjectTypes}} + {{range $element := .BoardTypes}}
{{$.locale.Tr $element.Translation}}
{{end}}
From 5f57f9713496e8c05bad726f5f9da166bbb13182 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Thu, 15 Dec 2022 12:34:56 -0800 Subject: [PATCH 05/22] gofmt --- models/project/board.go | 1 - models/project/project.go | 8 ++++---- templates/repo/projects/new.tmpl | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/models/project/board.go b/models/project/board.go index 9b54bbfd136cb..26ff45d3d8b02 100644 --- a/models/project/board.go +++ b/models/project/board.go @@ -45,7 +45,6 @@ const ( CardTypeImagesAndText ) - // BoardColorPattern is a regexp witch can validate BoardColor var BoardColorPattern = regexp.MustCompile("^#[0-9a-fA-F]{6}$") diff --git a/models/project/project.go b/models/project/project.go index 2c8dda3a36b77..9d8241d8c64d1 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -19,14 +19,14 @@ import ( type ( // BoardConfig is used to identify the type of board that is being created BoardConfig struct { - BoardType BoardType - Translation string + BoardType BoardType + Translation string } // CardConfig is used to identify the type of board card that is being used CardConfig struct { - CardType CardType - Translation string + CardType CardType + Translation string } // Type is used to identify the type of project in question and ownership diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index 801b5bb41af88..28efe1eccb363 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -53,7 +53,7 @@
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{range $element := .CardTypes}} - {{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2)) }} + {{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2))}}
{{$.locale.Tr $element.Translation}}
{{end}} From 93977700ac3519e06897fa89c922f4293fd11c8c Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Thu, 22 Dec 2022 23:34:00 -0800 Subject: [PATCH 06/22] Added migration. --- models/migrations/migrations.go | 2 ++ models/migrations/v1_19/v237.go | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 models/migrations/v1_19/v237.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 591bfa3e86a63..39b6f6b41c123 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -444,6 +444,8 @@ var migrations = []Migration{ NewMigration("Add index for access_token", v1_19.AddIndexForAccessToken), // v236 -> v237 NewMigration("Create secrets table", v1_19.CreateSecretsTable), + // v237 -> v238 + NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go new file mode 100644 index 0000000000000..64e7099defeb4 --- /dev/null +++ b/models/migrations/v1_19/v237.go @@ -0,0 +1,21 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_19 //nolint + +import ( + "fmt" + "xorm.io/xorm" +) + +// AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly +func AddCardTypeToProjectTable(x *xorm.Engine) error { + type Project struct { + CardType int `xorm:"NOT NULL DEFAULT 1"` + } + + if err := x.Sync2(new(Project)); err != nil { + return fmt.Errorf("Sync2: %w", err) + } + return nil +} From 4acf5ba116fdb189dd0eb15b930b112c6a1c2843 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Thu, 22 Dec 2022 23:41:17 -0800 Subject: [PATCH 07/22] gofmt --- models/migrations/v1_19/v237.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go index 64e7099defeb4..8b6b7424fea4b 100644 --- a/models/migrations/v1_19/v237.go +++ b/models/migrations/v1_19/v237.go @@ -5,6 +5,7 @@ package v1_19 //nolint import ( "fmt" + "xorm.io/xorm" ) From 0489cdbd04fb8483ec67da9f9db1d99617036450 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Sun, 8 Jan 2023 12:22:57 -0800 Subject: [PATCH 08/22] Only fill issuesAttachmentMap if appropriate CardType is set. --- routers/web/repo/projects.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index a7dc233d025ec..6043ad89ec0ca 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -310,15 +310,17 @@ func ViewProject(ctx *context.Context) { return } - issuesAttachmentMap := make(map[int64][]*attachment_model.Attachment) - for _, issuesList := range issuesMap { - for _, issue := range issuesList { - if issueAttachment, err := attachment_model.GetAttachmentsByIssueIDImagesLatest(ctx, issue.ID); err == nil { - issuesAttachmentMap[issue.ID] = issueAttachment + if project.CardType != project_model.CardTypeTextOnly { + issuesAttachmentMap := make(map[int64][]*attachment_model.Attachment) + for _, issuesList := range issuesMap { + for _, issue := range issuesList { + if issueAttachment, err := attachment_model.GetAttachmentsByIssueIDImagesLatest(ctx, issue.ID); err == nil { + issuesAttachmentMap[issue.ID] = issueAttachment + } } } + ctx.Data["issuesAttachmentMap"] = issuesAttachmentMap } - ctx.Data["issuesAttachmentMap"] = issuesAttachmentMap linkedPrsMap := make(map[int64][]*issues_model.Issue) for _, issuesList := range issuesMap { From d901ec7675bc31859d1f72aed99b6b468d21914b Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Sun, 8 Jan 2023 12:29:31 -0800 Subject: [PATCH 09/22] Removed migration. --- models/migrations/migrations.go | 2 -- models/migrations/v1_19/v237.go | 22 ---------------------- 2 files changed, 24 deletions(-) delete mode 100644 models/migrations/v1_19/v237.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 39b6f6b41c123..591bfa3e86a63 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -444,8 +444,6 @@ var migrations = []Migration{ NewMigration("Add index for access_token", v1_19.AddIndexForAccessToken), // v236 -> v237 NewMigration("Create secrets table", v1_19.CreateSecretsTable), - // v237 -> v238 - NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go deleted file mode 100644 index 8b6b7424fea4b..0000000000000 --- a/models/migrations/v1_19/v237.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package v1_19 //nolint - -import ( - "fmt" - - "xorm.io/xorm" -) - -// AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly -func AddCardTypeToProjectTable(x *xorm.Engine) error { - type Project struct { - CardType int `xorm:"NOT NULL DEFAULT 1"` - } - - if err := x.Sync2(new(Project)); err != nil { - return fmt.Errorf("Sync2: %w", err) - } - return nil -} From 326c5b89846f336255708c4e9a07f49245c10828 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Sun, 8 Jan 2023 12:36:19 -0800 Subject: [PATCH 10/22] Re-added migration as v238 --- models/migrations/migrations.go | 2 ++ models/migrations/v1_19/v238.go | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 models/migrations/v1_19/v238.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 591bfa3e86a63..7797481e525c0 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -444,6 +444,8 @@ var migrations = []Migration{ NewMigration("Add index for access_token", v1_19.AddIndexForAccessToken), // v236 -> v237 NewMigration("Create secrets table", v1_19.CreateSecretsTable), + // v238 -> v239 + NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go new file mode 100644 index 0000000000000..8b6b7424fea4b --- /dev/null +++ b/models/migrations/v1_19/v238.go @@ -0,0 +1,22 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_19 //nolint + +import ( + "fmt" + + "xorm.io/xorm" +) + +// AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly +func AddCardTypeToProjectTable(x *xorm.Engine) error { + type Project struct { + CardType int `xorm:"NOT NULL DEFAULT 1"` + } + + if err := x.Sync2(new(Project)); err != nil { + return fmt.Errorf("Sync2: %w", err) + } + return nil +} From 5936b56a246635c88659a47e4a0c10ea9c9c5e5e Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 17:10:25 -0800 Subject: [PATCH 11/22] Update models/migrations/v1_19/v238.go Co-authored-by: Jason Song --- models/migrations/v1_19/v238.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 8b6b7424fea4b..20691f96bdc88 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -15,8 +15,8 @@ func AddCardTypeToProjectTable(x *xorm.Engine) error { CardType int `xorm:"NOT NULL DEFAULT 1"` } - if err := x.Sync2(new(Project)); err != nil { - return fmt.Errorf("Sync2: %w", err) + if err := x.Sync(new(Project)); err != nil { + return fmt.Errorf("Sync: %w", err) } return nil } From 5e05becbd92b9930aefc7373edfc71e3ac9a8d9e Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 17:32:07 -0800 Subject: [PATCH 12/22] Update templates/repo/projects/view.tmpl Co-authored-by: Jason Song --- templates/repo/projects/view.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 6b352839a36aa..8dd4f0e4c6394 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -179,13 +179,13 @@
-
- {{if eq $.Project.CardType 2}} + {{if eq $.Project.CardType 2}} +
{{range (index $.issuesAttachmentMap .ID)}} {{.Name}} {{end}} - {{end}} -
+
+ {{end}}
From 853adca6b83946b0f8ea87e6e5d099e135253aa7 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 17:32:14 -0800 Subject: [PATCH 13/22] Update models/repo/attachment.go Co-authored-by: Jason Song --- models/repo/attachment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index 6db42cf51e9bf..cb05386d93871 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -134,7 +134,7 @@ func GetAttachmentsByIssueID(ctx context.Context, issueID int64) ([]*Attachment, // GetAttachmentsByIssueIDImagesLatest returns the latest image attachments of an issue. func GetAttachmentsByIssueIDImagesLatest(ctx context.Context, issueID int64) ([]*Attachment, error) { - attachments := make([]*Attachment, 0, 10) + attachments := make([]*Attachment, 0, 5) return attachments, db.GetEngine(ctx).Where(`issue_id = ? AND (name like '%.apng' OR name like '%.avif' OR name like '%.bmp' From 84fe0dab83f0dbcd7bf05e3e2da3cd27dad8e5eb Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 17:34:02 -0800 Subject: [PATCH 14/22] Update models/project/board.go Co-authored-by: Jason Song --- models/project/board.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/project/board.go b/models/project/board.go index 26ff45d3d8b02..dc4e2e6882a55 100644 --- a/models/project/board.go +++ b/models/project/board.go @@ -39,7 +39,7 @@ const ( const ( // CardTypeTextOnly is a project board card type that is text only - CardTypeTextOnly CardType = iota + 1 + CardTypeTextOnly CardType = iota // CardTypeImagesAndText is a project board card type that has images and text CardTypeImagesAndText From 8fd107a2164eccc8f77fafdbd98ecf8cceb86bc9 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 17:39:21 -0800 Subject: [PATCH 15/22] Added migration. --- models/migrations/migrations.go | 2 ++ models/migrations/v1_19/v241.go | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 models/migrations/v1_19/v241.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 15600f057cfb1..79e857388165d 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -455,6 +455,8 @@ var migrations = []Migration{ NewMigration("Add scope for access_token", v1_19.AddScopeForAccessTokens), // v240 -> v241 NewMigration("Add actions tables", v1_19.AddActionsTables), + // v241 -> v242 + NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go new file mode 100644 index 0000000000000..19352d65de3e0 --- /dev/null +++ b/models/migrations/v1_19/v241.go @@ -0,0 +1,22 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_19 //nolint + +import ( + "fmt" + + "xorm.io/xorm" +) + +// AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly +func AddCardTypeToProjectTable(x *xorm.Engine) error { + type Project struct { + CardType int `xorm:"NOT NULL"` + } + + if err := x.Sync(new(Project)); err != nil { + return fmt.Errorf("Sync: %w", err) + } + return nil +} From d734698ed9e596165ca64361d38c233c2d7780fa Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 18:04:20 -0800 Subject: [PATCH 16/22] Cleanup from merge with master. --- routers/web/org/projects.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 1ce44d4866d8e..d7079939f1631 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -121,7 +121,7 @@ func canWriteUnit(ctx *context.Context) bool { // NewProject render creating a project page func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") - ctx.Data["ProjectTypes"] = project_model.GetProjectsConfig() + ctx.Data["ProjectTypes"] = project_model.GetBoardConfig() ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() shared_user.RenderUserHeader(ctx) @@ -137,7 +137,7 @@ func NewProjectPost(ctx *context.Context) { if ctx.HasError() { ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) ctx.Data["PageIsViewProjects"] = true - ctx.Data["ProjectTypes"] = project_model.GetProjectsConfig() + ctx.Data["ProjectTypes"] = project_model.GetBoardConfig() ctx.HTML(http.StatusOK, tplProjectsNew) return } From a3b449aaacd117ebbc18a583a21f795f80e974bc Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 18:32:05 -0800 Subject: [PATCH 17/22] Bring new org functionality up to date. --- routers/web/org/projects.go | 4 ++-- templates/projects/new.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index d7079939f1631..6449d12de105a 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -121,7 +121,7 @@ func canWriteUnit(ctx *context.Context) bool { // NewProject render creating a project page func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") - ctx.Data["ProjectTypes"] = project_model.GetBoardConfig() + ctx.Data["BoardTypes"] = project_model.GetBoardConfig() ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() shared_user.RenderUserHeader(ctx) @@ -137,7 +137,7 @@ func NewProjectPost(ctx *context.Context) { if ctx.HasError() { ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) ctx.Data["PageIsViewProjects"] = true - ctx.Data["ProjectTypes"] = project_model.GetBoardConfig() + ctx.Data["BoardTypes"] = project_model.GetBoardConfig() ctx.HTML(http.StatusOK, tplProjectsNew) return } diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 04192c64c2610..19bf503692380 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -36,7 +36,7 @@
{{.locale.Tr "repo.projects.template.desc_helper"}}
- {{range $element := .ProjectTypes}} + {{range $element := .BoardTypes}}
{{$.locale.Tr $element.Translation}}
{{end}}
From a5e6e2244aede75b91b000b4bd45e225da249d17 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Tue, 7 Feb 2023 19:01:24 -0800 Subject: [PATCH 18/22] Cleanup from merge with master. --- routers/web/repo/projects.go | 46 ------------------------------------ 1 file changed, 46 deletions(-) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index be7dea622abc1..967b81c608516 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -673,49 +673,3 @@ func MoveIssues(ctx *context.Context) { "ok": true, }) } - -// CreateProject renders the generic project creation page -func CreateProject(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.projects.new") - ctx.Data["BoardTypes"] = project_model.GetBoardConfig() - ctx.Data["CardTypes"] = project_model.GetCardConfig() - ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) - - ctx.HTML(http.StatusOK, tplGenericProjectsNew) -} - -// CreateProjectPost creates an individual and/or organization project -func CreateProjectPost(ctx *context.Context, form forms.UserCreateProjectForm) { - user := checkContextUser(ctx, form.UID) - if ctx.Written() { - return - } - - ctx.Data["ContextUser"] = user - - if ctx.HasError() { - ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) - ctx.HTML(http.StatusOK, tplGenericProjectsNew) - return - } - - projectType := project_model.TypeIndividual - if user.IsOrganization() { - projectType = project_model.TypeOrganization - } - - if err := project_model.NewProject(&project_model.Project{ - Title: form.Title, - Description: form.Content, - CreatorID: user.ID, - BoardType: form.BoardType, - CardType: form.CardType, - Type: projectType, - }); err != nil { - ctx.ServerError("NewProject", err) - return - } - - ctx.Flash.Success(ctx.Tr("repo.projects.create_success", form.Title)) - ctx.Redirect(setting.AppSubURL + "/") -} From c93b60077eba81a390f524cf494f38d97195d809 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Wed, 8 Feb 2023 08:32:54 -0800 Subject: [PATCH 19/22] Update templates/repo/projects/view.tmpl Co-authored-by: delvh --- templates/repo/projects/view.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 8dd4f0e4c6394..569035869681f 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -179,7 +179,7 @@
- {{if eq $.Project.CardType 2}} + {{if eq $.Project.CardType 2}}{{/* Images and Text*/}}
{{range (index $.issuesAttachmentMap .ID)}} {{.Name}} From eac2221326565f05d4e12372c4ae099cffc9c961 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Wed, 8 Feb 2023 08:33:15 -0800 Subject: [PATCH 20/22] Update models/migrations/v1_19/v241.go Co-authored-by: delvh --- models/migrations/v1_19/v241.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go index 19352d65de3e0..865c3de944701 100644 --- a/models/migrations/v1_19/v241.go +++ b/models/migrations/v1_19/v241.go @@ -15,8 +15,5 @@ func AddCardTypeToProjectTable(x *xorm.Engine) error { CardType int `xorm:"NOT NULL"` } - if err := x.Sync(new(Project)); err != nil { - return fmt.Errorf("Sync: %w", err) - } - return nil + return x.Sync(new(Project)) } From 4ce05944c13a75cb346319c0c55e26119fbf54d9 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Wed, 8 Feb 2023 08:52:59 -0800 Subject: [PATCH 21/22] Fixed linter. --- models/migrations/v1_19/v241.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go index 865c3de944701..332be580faa31 100644 --- a/models/migrations/v1_19/v241.go +++ b/models/migrations/v1_19/v241.go @@ -4,8 +4,6 @@ package v1_19 //nolint import ( - "fmt" - "xorm.io/xorm" ) From 58ef8b1282de6ce525bcf1f0b34d1dafc2bf7e62 Mon Sep 17 00:00:00 2001 From: Nathaniel Sabanski Date: Wed, 8 Feb 2023 09:43:13 -0800 Subject: [PATCH 22/22] Images and Text type was updated. --- templates/repo/projects/view.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 569035869681f..711b488180346 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -179,7 +179,7 @@
- {{if eq $.Project.CardType 2}}{{/* Images and Text*/}} + {{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
{{range (index $.issuesAttachmentMap .ID)}} {{.Name}}