Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display issue task list on project cards #27865

Merged
merged 4 commits into from
Nov 2, 2023
Merged

Display issue task list on project cards #27865

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67954ff
Display task list on project.
KN4CK3R Nov 1, 2023
745272b
Merge branch 'main' into feature-project-tasklist
GiteaBot Nov 1, 2023
202fc0b
Merge branch 'main' into feature-project-tasklist
GiteaBot Nov 1, 2023
a2adcff
Merge branch 'main' into feature-project-tasklist
GiteaBot Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions models/issues/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,22 +142,14 @@ type Issue struct {
}

var (
issueTasksPat *regexp.Regexp
issueTasksDonePat *regexp.Regexp
)

const (
issueTasksRegexpStr = `(^\s*[-*]\s\[[\sxX]\]\s.)|(\n\s*[-*]\s\[[\sxX]\]\s.)`
issueTasksDoneRegexpStr = `(^\s*[-*]\s\[[xX]\]\s.)|(\n\s*[-*]\s\[[xX]\]\s.)`
issueTasksPat = regexp.MustCompile(`(^\s*[-*]\s\[[\sxX]\]\s.)|(\n\s*[-*]\s\[[\sxX]\]\s.)`)
issueTasksDonePat = regexp.MustCompile(`(^\s*[-*]\s\[[xX]\]\s.)|(\n\s*[-*]\s\[[xX]\]\s.)`)
)

// IssueIndex represents the issue index table
type IssueIndex db.ResourceIndex

func init() {
issueTasksPat = regexp.MustCompile(issueTasksRegexpStr)
issueTasksDonePat = regexp.MustCompile(issueTasksDoneRegexpStr)

db.RegisterModel(new(Issue))
db.RegisterModel(new(IssueIndex))
}
Expand Down
7 changes: 7 additions & 0 deletions templates/repo/issue/card.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@
</div>
{{end}}
{{end}}
{{$tasks := .GetTasks}}
{{if gt $tasks 0}}
<div class="meta gt-my-2">
{{svg "octicon-checklist" 16 "gt-mr-2 gt-vm"}}
<span class="gt-vm">{{.GetTasksDone}} / {{$tasks}}</span>
</div>
{{end}}
Comment on lines +52 to +58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we perhaps extract a subtemplate instead of manually adding it each time?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"each time"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue/PR list, milestones, projects, …

Copy link
Member Author

@KN4CK3R KN4CK3R Nov 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They already share a template (besides projects now). I have little frontend knowledge, someone else must create a subtemplate which works in all places.

Copy link
Member

@silverwind silverwind Nov 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the HTML content is the same it's trivial to extract a subtemplate, e.g. cut-paste into new file and add {{template "file"}} in place.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, but the classes are totally different.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally make classes the same, but we can do later I guess then.

</div>

{{if or .Labels .Assignees}}
Expand Down