ami/tl-vikunja
1
0
Fork 0
Code

fix: compile errors

Browse Source
This commit is contained in:
kolaente 2023-03-14 15:35:03 +01:00
parent 93056da792
commit a21bff3ffb
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
5 changed files with 24 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/models/events.go
View File

@ -166,46 +166,9 @@ func (t *TaskRelationDeletedEvent) Name() string {
return "task.relation.deleted" return "task.relation.deleted"
} }
////////////////////// ////////////////////
// Namespace Events //
//////////////////////
// NamespaceCreatedEvent represents an event where a namespace has been created
type NamespaceCreatedEvent struct {
Namespace *Namespace
Doer web.Auth
}
// Name defines the name for NamespaceCreatedEvent
func (n *NamespaceCreatedEvent) Name() string {
return "namespace.created"
}
// NamespaceUpdatedEvent represents an event where a namespace has been updated
type NamespaceUpdatedEvent struct {
Namespace *Namespace
Doer web.Auth
}
// Name defines the name for NamespaceUpdatedEvent
func (n *NamespaceUpdatedEvent) Name() string {
return "namespace.updated"
}
// NamespaceDeletedEvent represents a NamespaceDeletedEvent event
type NamespaceDeletedEvent struct {
Namespace *Namespace
Doer web.Auth
}
// TopicName defines the name for NamespaceDeletedEvent
func (t *NamespaceDeletedEvent) Name() string {
return "namespace.deleted"
}
/////////////////
// Project Events // // Project Events //
///////////////// ////////////////////
// ProjectCreatedEvent represents an event where a project has been created // ProjectCreatedEvent represents an event where a project has been created
type ProjectCreatedEvent struct { type ProjectCreatedEvent struct {

2
pkg/models/project.go
View File

@ -874,7 +874,7 @@ func (p *Project) Create(s *xorm.Session, a web.Auth) (err error) {
// @Router /projects/{id} [delete] // @Router /projects/{id} [delete]
func (p *Project) Delete(s *xorm.Session, a web.Auth) (err error) { func (p *Project) Delete(s *xorm.Session, a web.Auth) (err error) {
fullList, err := GetProjectSimpleByID(s, l.ID) fullList, err := GetProjectSimpleByID(s, p.ID)
if err != nil { if err != nil {
return return
} }

5
pkg/modules/migration/create_from_structure.go
View File

@ -248,8 +248,9 @@ func createProjectWithEverything(s *xorm.Session, project *models.ProjectWithTas
var lb *models.Label var lb *models.Label
var exists bool var exists bool
if label == nil { if label == nil {
continue continue
}lb, exists = labels[label.Title+label.HexColor] }
lb, exists = labels[label.Title+label.HexColor]
if !exists { if !exists {
err = label.Create(s, user) err = label.Create(s, user)
if err != nil { if err != nil {

34
pkg/modules/migration/ticktick/ticktick.go
View File

@ -39,26 +39,26 @@ type Migrator struct {
} }
type tickTickTask struct { type tickTickTask struct {
FolderName string`csv:"Folder Name"` FolderName string `csv:"Folder Name"`
ProjectName string`csv:"List Name"` ProjectName string `csv:"List Name"`
Title string`csv:"Title"` Title string `csv:"Title"`
TagsList string `csv:"Tags"` TagsList string `csv:"Tags"`
Tags []string`csv:"-"` Tags []string `csv:"-"`
Content string`csv:"Content"` Content string `csv:"Content"`
IsChecklistString string `csv:"Is Check list"` IsChecklistString string `csv:"Is Check list"`
IsCheckproject bool`csv:"-"` IsChecklist bool `csv:"-"`
StartDate tickTickTime `csv:"Start Date"` StartDate tickTickTime `csv:"Start Date"`
DueDate tickTickTime `csv:"Due Date"` DueDate tickTickTime `csv:"Due Date"`
ReminderDuration string `csv:"Reminder"` ReminderDuration string `csv:"Reminder"`
Reminder time.Duration`csv:"-"` Reminder time.Duration `csv:"-"`
Repeat string`csv:"Repeat"` Repeat string `csv:"Repeat"`
Priority int`csv:"Priority"` Priority int `csv:"Priority"`
Status string`csv:"Status"` Status string `csv:"Status"`
CreatedTime tickTickTime `csv:"Created Time"` CreatedTime tickTickTime `csv:"Created Time"`
CompletedTime tickTickTime `csv:"Completed Time"` CompletedTime tickTickTime `csv:"Completed Time"`
Order float64`csv:"Order"` Order float64 `csv:"Order"`
TaskID int64`csv:"taskId"` TaskID int64 `csv:"taskId"`
ParentID int64`csv:"parentId"` ParentID int64 `csv:"parentId"`
} }
type tickTickTime struct { type tickTickTime struct {

2
pkg/user/users_project.go
View File

@ -33,7 +33,7 @@ type ProjectUserOpts struct {
} }
// ListUsers returns a list with all users, filtered by an optional search string // ListUsers returns a list with all users, filtered by an optional search string
func ProjectUsers(s *xorm.Session, search string, opts *ProjectUserOpts) (users []*User, err error) { func ListUsers(s *xorm.Session, search string, opts *ProjectUserOpts) (users []*User, err error) {
if opts == nil { if opts == nil {
opts = &ProjectUserOpts{} opts = &ProjectUserOpts{}
} }