diff options
| author | Denys Konovalov <kontakt@denyskon.de> | 2023-08-12 12:30:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 10:30:28 +0000 |
| commit | ab78c39e4152e6d2e3ace594a24b6e13cb3a1678 (patch) | |
| tree | 369e037b8a22677d3125abb77692a89693d28ef7 /routers/web | |
| parent | 74930b1ccd9acacd1ddaa30d1b4849b0e4570d7c (diff) | |
| download | gitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.tar.gz gitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.zip | |
Refactor project templates (#26448)
This PR refactors a bunch of projects-related code, mostly the
templates.
The following things were done:
- rename boards to columns in frontend code
- use the new `ctx.Locale.Tr` method
- cleanup template, remove useless newlines, classes, comments
- merge org-/user and repo level project template together
- move "new column" button into project toolbar
- move issue card (shared by projects and pinned issues) to shared
template, remove useless duplicated styles
- add search function to projects (to make the layout more similar to
milestones list where it is inherited from :laughing:)
- maybe more changes I forgot I've done :laughing:
Closes #24893
After:
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'routers/web')
| -rw-r--r-- | routers/web/org/projects.go | 4 | ||||
| -rw-r--r-- | routers/web/repo/projects.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 34888f1550..4032162b5c 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -47,6 +47,7 @@ func Projects(ctx *context.Context) { sortType := ctx.FormTrim("sort") isShowClosed := strings.ToLower(ctx.FormTrim("state")) == "closed" + keyword := ctx.FormTrim("q") page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -64,6 +65,7 @@ func Projects(ctx *context.Context) { IsClosed: util.OptionalBoolOf(isShowClosed), OrderBy: project_model.GetSearchOrderByBySortType(sortType), Type: projectType, + Title: keyword, }) if err != nil { ctx.ServerError("FindProjects", err) @@ -395,7 +397,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["Project"] = project ctx.Data["IssuesMap"] = issuesMap - ctx.Data["Boards"] = boards + ctx.Data["Columns"] = boards // TODO: rename boards to columns in backend shared_user.RenderUserHeader(ctx) err = shared_user.LoadHeaderCount(ctx) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index b8662e0605..eef57f4627 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -54,6 +54,7 @@ func Projects(ctx *context.Context) { sortType := ctx.FormTrim("sort") isShowClosed := strings.ToLower(ctx.FormTrim("state")) == "closed" + keyword := ctx.FormTrim("q") repo := ctx.Repo.Repository page := ctx.FormInt("page") if page <= 1 { @@ -76,6 +77,7 @@ func Projects(ctx *context.Context) { IsClosed: util.OptionalBoolOf(isShowClosed), OrderBy: project_model.GetSearchOrderByBySortType(sortType), Type: project_model.TypeRepository, + Title: keyword, }) if err != nil { ctx.ServerError("GetProjects", err) @@ -364,7 +366,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.Data["Project"] = project ctx.Data["IssuesMap"] = issuesMap - ctx.Data["Boards"] = boards + ctx.Data["Columns"] = boards // TODO: rename boards to columns in backend ctx.HTML(http.StatusOK, tplProjectsView) } |