ami/tl-vikunja
1
0
Fork 0
Code

fix(tasks): return a correct task identifier if the list does not have a good one set

Browse Source
This commit is contained in:
kolaente 2023-06-07 18:17:08 +02:00
parent 1a840c8b87
commit 69bd023b62
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/notifications.go
View File

@ -136,8 +136,8 @@ type TaskDeletedNotification struct {
// ToMail returns the mail notification for TaskDeletedNotification // ToMail returns the mail notification for TaskDeletedNotification
func (n *TaskDeletedNotification) ToMail() *notifications.Mail { func (n *TaskDeletedNotification) ToMail() *notifications.Mail {
return notifications.NewMail(). return notifications.NewMail().
Subject(n.Task.Title + "(" + n.Task.GetFullIdentifier() + ")" + " has been deleted"). Subject(n.Task.Title + " (" + n.Task.GetFullIdentifier() + ")" + " has been deleted").
Line(n.Doer.GetName() + " has deleted the task " + n.Task.Title + "(" + n.Task.GetFullIdentifier() + ")") Line(n.Doer.GetName() + " has deleted the task " + n.Task.Title + " (" + n.Task.GetFullIdentifier() + ")")
} }
// ToDB returns the TaskDeletedNotification notification in a format which can be saved in the db // ToDB returns the TaskDeletedNotification notification in a format which can be saved in the db

3
pkg/models/tasks.go
View File

@ -151,6 +151,9 @@ func (*Task) TableName() string {
// GetFullIdentifier returns the task identifier if the task has one and the index prefixed with # otherwise. // GetFullIdentifier returns the task identifier if the task has one and the index prefixed with # otherwise.
func (t *Task) GetFullIdentifier() string { func (t *Task) GetFullIdentifier() string {
if t.Identifier != "" { if t.Identifier != "" {
if strings.HasPrefix(t.Identifier, "-") {
return "#" + strings.TrimPrefix(t.Identifier, "-")
}
return t.Identifier return t.Identifier
} }