fix(filters): do not create a default filter for list view when creating a saved filter
Because a default filter in a filter is highly unexpected, it can lead to these filters cancelling each other out, resulting in confusing behaviour. See https://kolaente.dev/vikunja/vikunja/issues/2547#issuecomment-65180
This commit is contained in:
parent
38c30d1eee
commit
5644130f01
@ -822,7 +822,7 @@ func CreateProject(s *xorm.Session, project *Project, auth web.Auth, createBackl
|
|||||||
}
|
}
|
||||||
|
|
||||||
if createDefaultViews {
|
if createDefaultViews {
|
||||||
err = CreateDefaultViewsForProject(s, project, auth, createBacklogBucket)
|
err = CreateDefaultViewsForProject(s, project, auth, createBacklogBucket, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -398,13 +398,15 @@ func GetProjectViewByID(s *xorm.Session, id int64) (view *ProjectView, err error
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth, createBacklogBucket bool) (err error) {
|
func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth, createBacklogBucket bool, createDefaultListFilter bool) (err error) {
|
||||||
list := &ProjectView{
|
list := &ProjectView{
|
||||||
ProjectID: project.ID,
|
ProjectID: project.ID,
|
||||||
Title: "List",
|
Title: "List",
|
||||||
ViewKind: ProjectViewKindList,
|
ViewKind: ProjectViewKindList,
|
||||||
Position: 100,
|
Position: 100,
|
||||||
Filter: "done = false",
|
}
|
||||||
|
if createDefaultListFilter {
|
||||||
|
list.Filter = "done = false"
|
||||||
}
|
}
|
||||||
err = createProjectView(s, list, a, createBacklogBucket)
|
err = createProjectView(s, list, a, createBacklogBucket)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -123,7 +123,7 @@ func (sf *SavedFilter) Create(s *xorm.Session, auth web.Auth) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = CreateDefaultViewsForProject(s, &Project{ID: getProjectIDFromSavedFilterID(sf.ID)}, auth, true)
|
err = CreateDefaultViewsForProject(s, &Project{ID: getProjectIDFromSavedFilterID(sf.ID)}, auth, true, false)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user