From 30b41bd14316328a2e72ed0e8776c634f58150ac Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 19 Mar 2024 00:36:33 +0100 Subject: [PATCH] fix(views): lint --- pkg/migration/20240313230538.go | 3 ++- pkg/migration/20240314214802.go | 2 +- pkg/models/kanban.go | 2 +- pkg/models/project_duplicate.go | 1 + pkg/models/project_view.go | 9 +++++---- pkg/models/project_view_rights.go | 24 ++++++------------------ pkg/models/task_position.go | 3 ++- pkg/models/tasks.go | 3 +++ 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/pkg/migration/20240313230538.go b/pkg/migration/20240313230538.go index 04abf05fa..3f712017b 100644 --- a/pkg/migration/20240313230538.go +++ b/pkg/migration/20240313230538.go @@ -17,8 +17,9 @@ package migration import ( - "src.techknowlogick.com/xormigrate" "time" + + "src.techknowlogick.com/xormigrate" "xorm.io/xorm" ) diff --git a/pkg/migration/20240314214802.go b/pkg/migration/20240314214802.go index 6797528ad..c266bbaa1 100644 --- a/pkg/migration/20240314214802.go +++ b/pkg/migration/20240314214802.go @@ -46,7 +46,7 @@ func (task20240314214802) TableName() string { func init() { migrations = append(migrations, &xormigrate.Migration{ ID: "20240314214802", - Description: "make task position seperate", + Description: "make task position separate", Migrate: func(tx *xorm.Engine) error { err := tx.Sync2(taskPositions20240314214802{}) if err != nil { diff --git a/pkg/models/kanban.go b/pkg/models/kanban.go index c2c79d10b..d420452ad 100644 --- a/pkg/models/kanban.go +++ b/pkg/models/kanban.go @@ -121,7 +121,7 @@ func getDefaultBucketID(s *xorm.Session, view *ProjectView) (bucketID int64, err // @Success 200 {array} models.Bucket "The buckets" // @Failure 500 {object} models.Message "Internal server error" // @Router /projects/{id}/views/{view}/buckets [get] -func (b *Bucket) ReadAll(s *xorm.Session, auth web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) { +func (b *Bucket) ReadAll(s *xorm.Session, auth web.Auth, _ string, _ int, _ int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) { view, err := GetProjectViewByIDAndProject(s, b.ProjectViewID, b.ProjectID) if err != nil { diff --git a/pkg/models/project_duplicate.go b/pkg/models/project_duplicate.go index 1cfeede51..dbc38d2af 100644 --- a/pkg/models/project_duplicate.go +++ b/pkg/models/project_duplicate.go @@ -246,6 +246,7 @@ func duplicateViews(s *xorm.Session, pd *ProjectDuplicate, doer web.Auth, taskMa }) } + _, err = s.Insert(&taskPositions) return } diff --git a/pkg/models/project_view.go b/pkg/models/project_view.go index 84c95eab0..6d6bd5fbe 100644 --- a/pkg/models/project_view.go +++ b/pkg/models/project_view.go @@ -17,10 +17,11 @@ package models import ( - "code.vikunja.io/web" "encoding/json" "fmt" "time" + + "code.vikunja.io/web" "xorm.io/xorm" ) @@ -58,7 +59,7 @@ func (p *ProjectViewKind) UnmarshalJSON(bytes []byte) error { case "kanban": *p = ProjectViewKindKanban default: - return fmt.Errorf("unkown project view kind: %s", value) + return fmt.Errorf("unknown project view kind: %s", value) } return nil @@ -107,7 +108,7 @@ func (p *BucketConfigurationModeKind) UnmarshalJSON(bytes []byte) error { case "filter": *p = BucketConfigurationModeFilter default: - return fmt.Errorf("unkown bucket configuration mode kind: %s", value) + return fmt.Errorf("unknown bucket configuration mode kind: %s", value) } return nil @@ -236,7 +237,7 @@ func (p *ProjectView) ReadOne(s *xorm.Session, _ web.Auth) (err error) { // @Failure 403 {object} web.HTTPError "The user does not have access to the project view" // @Failure 500 {object} models.Message "Internal error" // @Router /projects/{project}/views/{id} [delete] -func (p *ProjectView) Delete(s *xorm.Session, a web.Auth) (err error) { +func (p *ProjectView) Delete(s *xorm.Session, _ web.Auth) (err error) { _, err = s. Where("id = ? AND project_id = ?", p.ID, p.ProjectID). Delete(&ProjectView{}) diff --git a/pkg/models/project_view_rights.go b/pkg/models/project_view_rights.go index 6c3e4bed9..39dad870b 100644 --- a/pkg/models/project_view_rights.go +++ b/pkg/models/project_view_rights.go @@ -22,37 +22,25 @@ import ( ) func (p *ProjectView) CanRead(s *xorm.Session, a web.Auth) (bool, int, error) { - pp, err := p.getProject(s) - if err != nil { - return false, 0, err - } + pp := p.getProject() return pp.CanRead(s, a) } func (p *ProjectView) CanDelete(s *xorm.Session, a web.Auth) (bool, error) { - pp, err := p.getProject(s) - if err != nil { - return false, err - } + pp := p.getProject() return pp.CanUpdate(s, a) } func (p *ProjectView) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) { - pp, err := p.getProject(s) - if err != nil { - return false, err - } + pp := p.getProject() return pp.CanUpdate(s, a) } func (p *ProjectView) CanCreate(s *xorm.Session, a web.Auth) (bool, error) { - pp, err := p.getProject(s) - if err != nil { - return false, err - } + pp := p.getProject() return pp.CanUpdate(s, a) } -func (p *ProjectView) getProject(s *xorm.Session) (pp *Project, err error) { - return &Project{ID: p.ProjectID}, nil +func (p *ProjectView) getProject() (pp *Project) { + return &Project{ID: p.ProjectID} } diff --git a/pkg/models/task_position.go b/pkg/models/task_position.go index 470acd635..9f558e67a 100644 --- a/pkg/models/task_position.go +++ b/pkg/models/task_position.go @@ -17,8 +17,9 @@ package models import ( - "code.vikunja.io/web" "math" + + "code.vikunja.io/web" "xorm.io/xorm" ) diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go index 4c38b31a5..d9452c861 100644 --- a/pkg/models/tasks.go +++ b/pkg/models/tasks.go @@ -932,6 +932,9 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) { Where(builder.Eq{"project_id": t.ProjectID}), ). Find(&buckets) + if err != nil { + return err + } for _, view := range views { // Only update the bucket when the current view