Skip to content

Commit c77eda4

Browse files
patcitopatcito
committed
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 <[email protected]> update swagger Clean up the indenting Co-authored-by: zeripath <[email protected]> use tabs Co-authored-by: zeripath <[email protected]> use tabs add loadRepository as per @zeripath suggestion move projects css to features/projects.less as per @silverwind request #12506 (review) use transaction to update projects issues priorities as per @zeripath suggestion #12506 (comment) make import fit on one line make use of loadRepository indent html properly as per suggestion by @silverwind #12506 (comment) remove non-working code as per @zeripath suggestion #12506 (comment) remove non-used code as per @zeripath suggestion #12506 (comment) fix syntax, remove content-type on request #12506 (comment) use closest instead of parent as per @silverwind suggestion #12506 (review) use for instead of forEach because @silverwind use for instead of forEach because @silverwind #12506 (review) use // falls through as per @silverwind #12506 (comment) listen to body keyup only on project page #12506 (review) Update models/project_board.go Co-authored-by: Lauris BH <[email protected]> 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 <[email protected]> fix linting Update web_src/js/features/issuesutil.js Co-authored-by: silverwind <[email protected]> Update web_src/js/features/issuesutil.js Co-authored-by: silverwind <[email protected]> Update web_src/js/features/issuesutil.js Co-authored-by: silverwind <[email protected]> Update web_src/js/features/projects.js Co-authored-by: silverwind <[email protected]> Update web_src/js/features/projects.js Co-authored-by: silverwind <[email protected]> Update models/project_issue.go Update models/issue.go Co-authored-by: zeripath <[email protected]> Update web_src/js/features/issuesutil.js Co-authored-by: silverwind <[email protected]> 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 #12506 (review) #12506 (comment) Update templates/repo/projects/view.tmpl Co-authored-by: silverwind <[email protected]> Update templates/repo/projects/view.tmpl Co-authored-by: silverwind <[email protected]> Update web_src/js/features/projects.js Co-authored-by: silverwind <[email protected]> fix project_issue table name in query make another fetch async as per @silverwind Update models/project.go Co-authored-by: Lauris BH <[email protected]> Update models/project.go Co-authored-by: Lauris BH <[email protected]> more and rename UpdateBoards functions as per @6543 Update models/project.go Co-authored-by: Lauris BH <[email protected]> Update models/project.go Co-authored-by: Lauris BH <[email protected]> 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 <[email protected]> Update routers/repo/issue.go Co-authored-by: zeripath <[email protected]> Update web_src/less/features/projects.less Co-authored-by: silverwind <[email protected]> fix uneeded column in query and remove css class as suggested by @silverwind Update models/project.go Co-authored-by: Lauris BH <[email protected]> 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
1 parent e853f33 commit c77eda4

File tree

22 files changed

+2003
-1858
lines changed

22 files changed

+2003
-1858
lines changed

‎models/issue.go

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"code.gitea.io/gitea/modules/base"
1616
"code.gitea.io/gitea/modules/log"
17+
"code.gitea.io/gitea/modules/markup"
1718
"code.gitea.io/gitea/modules/setting"
1819
"code.gitea.io/gitea/modules/structs"
1920
api "code.gitea.io/gitea/modules/structs"
@@ -63,6 +64,7 @@ type Issue struct {
6364
Reactions ReactionList `xorm:"-"`
6465
TotalTrackedTime int64 `xorm:"-"`
6566
Assignees []*User `xorm:"-"`
67+
ProjectIssueID ProjectIssue
6668

6769
// IsLocked limits commenting abilities to users on an issue
6870
// with write access
@@ -1100,9 +1102,10 @@ type IssuesOptions struct {
11001102
ExcludedLabelNames []string
11011103
SortType string
11021104
IssueIDs []int64
1103-
NotInProjectID int64
1105+
ExcludeProjectID int64
11041106
// prioritize issues from this repo
1105-
PriorityRepoID int64
1107+
PriorityRepoID int64
1108+
RenderEmojiTitle util.OptionalBool
11061109
}
11071110

11081111
// sortIssuesSession sort an issues-related session based on the provided
@@ -1181,20 +1184,19 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) {
11811184

11821185
if opts.ProjectID > 0 {
11831186
sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
1184-
And("project_issue.project_id=?", opts.ProjectID).OrderBy("priority")
1187+
And("project_issue.project_id=?", opts.ProjectID).OrderBy("`project_issue`.priority")
11851188
}
1189+
11861190
if opts.ProjectBoardID != 0 {
11871191
if opts.ProjectBoardID > 0 {
1188-
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}).OrderBy("priority"))
1192+
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}).OrderBy("`project_issue`.priority"))
11891193
} else {
1190-
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).OrderBy("priority"))
1194+
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).OrderBy("`project_issue`.priority"))
11911195
}
11921196
}
11931197

1194-
if opts.NotInProjectID != 0 {
1195-
if opts.NotInProjectID > 0 {
1196-
sess.NotIn("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_id": opts.NotInProjectID}).OrderBy("priority"))
1197-
}
1198+
if opts.ExcludeProjectID != 0 {
1199+
sess.NotIn("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_id": opts.ExcludeProjectID}).OrderBy("`project_issue`.priority"))
11981200
}
11991201

12001202
switch opts.IsPull {
@@ -1286,7 +1288,15 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
12861288
if err := IssueList(issues).LoadAttributes(); err != nil {
12871289
return nil, fmt.Errorf("LoadAttributes: %v", err)
12881290
}
1289-
1291+
if opts.RenderEmojiTitle == util.OptionalBoolTrue {
1292+
var issuesWithEmojis []*Issue
1293+
for _, issue := range issues {
1294+
title := string(markup.RenderEmoji(issue.Title))
1295+
issue.Title = title
1296+
issuesWithEmojis = append(issuesWithEmojis, issue)
1297+
}
1298+
return issuesWithEmojis, nil
1299+
}
12901300
return issues, nil
12911301
}
12921302

‎models/migrations/migrations.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ var migrations = []Migration{
254254
NewMigration("code comment replies should have the commitID of the review they are replying to", updateCodeCommentReplies),
255255
// v159 -> v160
256256
NewMigration("update reactions constraint", updateReactionConstraint),
257+
// v160 -> v161
258+
NewMigration("Add projects boards and issues priorities", addProjectsIssuesBoardsPriority),
257259
}
258260

259261
// GetCurrentDBVersion returns the current db version

‎models/migrations/v160.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2020 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package migrations
6+
7+
import (
8+
"xorm.io/xorm"
9+
)
10+
11+
func addProjectsIssuesBoardsPriority(x *xorm.Engine) error {
12+
// ProjectIssue saves relation from issue to a project
13+
type ProjectIssue struct {
14+
Priority int `xorm:"NOT NULL DEFAULT 0"`
15+
}
16+
17+
if err := x.Sync2(new(ProjectIssue)); err != nil {
18+
return err
19+
}
20+
21+
type ProjectBoard struct {
22+
Priority int `xorm:"NOT NULL DEFAULT 0"`
23+
}
24+
25+
return x.Sync2(new(ProjectBoard))
26+
}

‎models/project.go

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -308,50 +308,23 @@ func deleteProjectByID(e Engine, id int64) error {
308308
return updateRepositoryProjectCount(e, p.RepoID)
309309
}
310310

311-
// Update given boards priority for a project
312-
func UpdateBoards(boards []ProjectBoard) error {
313-
for _, board := range boards {
314-
if _, err := x.ID(board.ID).Cols("priority").Update(&board); err != nil {
315-
log.Info("failed updating board priorities %s", err)
316-
return err
317-
}
318-
319-
}
320-
return nil
311+
// LoadRepository loads repository of a given project
312+
func (p *Project) LoadRepository() error {
313+
return p.loadRepository(x)
321314
}
322315

323-
// Update given issue priority and column
324-
func UpdateBoardIssues(issues []ProjectIssue) (error, []ProjectIssue) {
325-
var updatedIssues []ProjectIssue
326-
for _, pissue := range issues {
327-
if pissue.ID != 0 {
328-
if _, err := x.ID(pissue.ID).Cols("priority", "project_board_id").Update(&pissue); err != nil {
329-
log.Info("failed updating cards priorities %s", err)
330-
return err, updatedIssues
331-
} else {
332-
updatedIssues = append(updatedIssues, pissue)
333-
}
334-
} else {
335-
if _, err := x.Insert(&pissue); err != nil {
336-
log.Info("failed inserting cards priorities %s", err)
337-
return err, updatedIssues
338-
} else {
339-
updatedIssues = append(updatedIssues, pissue)
340-
}
341-
}
316+
// loadRepository loads repository of a given project
317+
func (p *Project) loadRepository(e Engine) error {
318+
if p.Repo != nil {
319+
return nil
342320
}
343-
return nil, updatedIssues
344-
}
345-
346-
func (p *Project) LoadRepository() error {
347-
var repo = Repository{}
348321
if p.Type == ProjectTypeRepository {
349-
_, err := x.ID(p.RepoID).Get(&repo)
350-
p.Repo = &repo
351-
if err != nil {
352-
log.Info("failed getting repo %w", err)
322+
repo := &Repository{}
323+
if _, err := e.ID(p.RepoID).Get(repo); err != nil {
324+
log.Info("failed getting repo %v", err)
325+
return err
353326
}
354-
return err
327+
p.Repo = repo
355328
}
356329
return nil
357330
}

‎models/project_board.go

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type ProjectBoard struct {
3636
ID int64 `xorm:"pk autoincr"`
3737
Title string
3838
Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board
39-
Priority int
39+
Priority int `xorm:"NOT NULL DEFAULT 0"`
4040

4141
ProjectID int64 `xorm:"INDEX NOT NULL"`
4242
CreatorID int64 `xorm:"NOT NULL"`
@@ -190,7 +190,7 @@ func GetUncategorizedBoard(projectID int64) (*ProjectBoard, error) {
190190
}, nil
191191
}
192192

193-
// LoadIssues load issues assigned to this board
193+
// LoadProjectIssues load project issues assigned to this board
194194
func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) {
195195
var boardID int64
196196
if !b.Default {
@@ -200,25 +200,27 @@ func (b *ProjectBoard) LoadProjectIssues() ([]*ProjectIssue, error) {
200200
// Issues without ProjectBoardID
201201
boardID = 0
202202
}
203-
var projectIssuesDB []*ProjectIssue
204203
var projectIssues []*ProjectIssue
205-
err := x.Table("project_issue").Where("project_board_id = ? and project_id =?",
206-
boardID, b.ProjectID).
207-
OrderBy("priority").Find(&projectIssuesDB)
208-
for _, projectIssue := range projectIssuesDB {
209-
if issue, err := getIssueByID(x, projectIssue.IssueID); err != nil {
210-
log.Info("failed getting projectIssue's issue %v\n", err)
211-
} else {
212-
issue.LoadLabels()
213-
issue.LoadMilestone()
214-
issue.loadAssignees(x)
215-
projectIssue.Issue = issue
216-
projectIssues = append(projectIssues, projectIssue)
217-
}
204+
var issues []*Issue
205+
if err := x.Table("issue").
206+
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").
207+
Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
208+
Where("project_board_id = ? and project_id =?",
209+
boardID, b.ProjectID).
210+
OrderBy("`project_issue`.priority").Find(&issues); err != nil {
211+
log.Error("LoadAttributes: %v", err)
212+
}
213+
214+
if err := IssueList(issues).LoadAttributes(); err != nil {
215+
log.Error("LoadAttributes: %v", err)
218216
}
219217

220-
b.ProjectIssues = projectIssues
221-
return projectIssues, err
218+
for _, issue := range issues {
219+
projectIssue := issue.ProjectIssueID
220+
projectIssue.Issue = issue
221+
projectIssues = append(projectIssues, &projectIssue)
222+
}
223+
return projectIssues, nil
222224
}
223225

224226
// LoadIssues load issues assigned to the boards
@@ -232,3 +234,19 @@ func (bs ProjectBoardList) LoadIssues() error {
232234
}
233235
return nil
234236
}
237+
238+
// UpdateBoardsPriority updates boards priority for a project
239+
func UpdateBoardsPriority(boards []ProjectBoard) error {
240+
sess := x.NewSession()
241+
if err := sess.Begin(); err != nil {
242+
return err
243+
}
244+
defer sess.Close()
245+
for _, board := range boards {
246+
if _, err := sess.ID(board.ID).Cols("priority").Update(&board); err != nil {
247+
log.Info("failed updating board priorities %s", err)
248+
return err
249+
}
250+
}
251+
return sess.Commit()
252+
}

‎models/project_issue.go

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ import (
88
"fmt"
99

1010
"code.gitea.io/gitea/modules/log"
11+
1112
"xorm.io/xorm"
1213
)
1314

1415
// ProjectIssue saves relation from issue to a project
1516
type ProjectIssue struct {
16-
ID int64 `xorm:"pk autoincr"`
17-
IssueID int64 `xorm:"INDEX"`
18-
ProjectID int64 `xorm:"INDEX"`
19-
IssueTitle string `xorm:"-"`
20-
IssueIsPull bool `xorm:"-"`
21-
Priority int
22-
Issue *Issue `xorm:"-"`
17+
ID int64 `xorm:"pk autoincr"`
18+
IssueID int64 `xorm:"INDEX"`
19+
ProjectID int64 `xorm:"INDEX"`
20+
Priority int `xorm:"NOT NULL DEFAULT 0"`
21+
Issue *Issue `xorm:"-"`
2322

2423
// If 0, then it has not been added to a specific board in the project
2524
ProjectBoardID int64 `xorm:"INDEX"`
@@ -69,12 +68,12 @@ func (i *Issue) projectID(e Engine) int64 {
6968
return ip.ProjectID
7069
}
7170

72-
// ProjectBoardID return project board id if issue was assigned to one
73-
func (i *Issue) ProjectBoardID() int64 {
74-
return i.projectBoardID(x)
71+
// LoadProjectBoardID return project board id if issue was assigned to one
72+
func (i *Issue) LoadProjectBoardID() int64 {
73+
return i.loadProjectBoardID(x)
7574
}
7675

77-
func (i *Issue) projectBoardID(e Engine) int64 {
76+
func (i *Issue) loadProjectBoardID(e Engine) int64 {
7877
var ip ProjectIssue
7978
has, err := e.Where("issue_id=?", i.ID).Get(&ip)
8079
if err != nil || !has {
@@ -146,7 +145,6 @@ func ChangeProjectAssign(issue *Issue, doer *User, newProjectID int64) error {
146145
func addUpdateIssueProject(e *xorm.Session, issue *Issue, doer *User, newProjectID int64) error {
147146
oldProjectID := issue.projectID(e)
148147
if _, err := e.Where("project_issue.issue_id=?", issue.ID).Delete(&ProjectIssue{}); err != nil {
149-
log.Info("failed deleting project issue %w", err)
150148
return err
151149
}
152150

@@ -222,3 +220,36 @@ func (pb *ProjectBoard) removeIssues(e Engine) error {
222220
_, err := e.Exec("UPDATE `project_issue` SET project_board_id = 0 WHERE project_board_id = ? ", pb.ID)
223221
return err
224222
}
223+
224+
// UpdateBoardIssuesPriority update given board issue priority
225+
func UpdateBoardIssuesPriority(issues []ProjectIssue) ([]ProjectIssue, error) {
226+
sess := x.NewSession()
227+
if err := sess.Begin(); err != nil {
228+
var updatedIssues []ProjectIssue
229+
return updatedIssues, err
230+
}
231+
defer sess.Close()
232+
var updatedIssues []ProjectIssue
233+
for _, pissue := range issues {
234+
if pissue.ID != 0 {
235+
if _, err := sess.ID(pissue.ID).Cols("priority", "project_board_id").Update(&pissue); err != nil {
236+
log.Info("failed updating cards priorities %s", err)
237+
return updatedIssues, err
238+
}
239+
updatedIssues = append(updatedIssues, pissue)
240+
} else {
241+
var existingIssue ProjectIssue
242+
if found, err := sess.Where("issue_id = ? and project_id = ?", pissue.IssueID, pissue.ProjectID).
243+
Get(&existingIssue); err != nil {
244+
log.Error("failed finding issue %s", err)
245+
} else if !found {
246+
if _, err := sess.Insert(&pissue); err != nil {
247+
log.Info("failed inserting cards priorities %s", err)
248+
return updatedIssues, err
249+
}
250+
updatedIssues = append(updatedIssues, pissue)
251+
}
252+
}
253+
}
254+
return updatedIssues, sess.Commit()
255+
}

‎modules/auth/repo_form.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ func (f *DeadlineForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi
765765

766766
// UpdateBoardPriorityForm form for updating cards on drag and drop
767767
type UpdateBoardPriorityForm struct {
768-
Boards []models.ProjectBoard `form:"boards" json:"boards"`
768+
Boards []models.ProjectBoard
769769
}
770770

771771
// Validate validates the fields

‎modules/markup/html.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package markup
77
import (
88
"bytes"
99
"fmt"
10+
"html/template"
1011
"net/url"
1112
"path"
1213
"path/filepath"
@@ -287,9 +288,19 @@ func RenderDescriptionHTML(
287288
return ctx.postProcess(rawHTML)
288289
}
289290

291+
// RenderEmoji renders html text with emoji post processors
292+
func RenderEmoji(text string) template.HTML {
293+
renderedText, err := renderEmoji([]byte(template.HTMLEscapeString(text)))
294+
if err != nil {
295+
log.Error("RenderEmoji: %v", err)
296+
return template.HTML("")
297+
}
298+
return template.HTML(renderedText)
299+
}
300+
290301
// RenderEmoji for when we want to just process emoji and shortcodes
291302
// in various places it isn't already run through the normal markdown procesor
292-
func RenderEmoji(
303+
func renderEmoji(
293304
rawHTML []byte,
294305
) ([]byte, error) {
295306
ctx := &postProcessCtx{

0 commit comments

Comments
 (0)