ami/tl-vikunja
1
0
Fork 0
Code

feat: remove ChildProjects project property

Browse Source
This commit is contained in:
kolaente 2023-04-03 11:27:55 +02:00
parent f2d943f5c4
commit edcb806421
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/models/project.go
View File

@ -51,8 +51,6 @@ type Project struct {
ParentProjectID int64 `xorm:"bigint INDEX null" json:"parent_project_id"` ParentProjectID int64 `xorm:"bigint INDEX null" json:"parent_project_id"`
ParentProject *Project `xorm:"-" json:"-"` ParentProject *Project `xorm:"-" json:"-"`
ChildProjects []*Project `xorm:"-" json:"child_projects"`
// The user who created this project. // The user who created this project.
Owner *user.User `xorm:"-" json:"owner" valid:"-"` Owner *user.User `xorm:"-" json:"owner" valid:"-"`
@ -214,18 +212,7 @@ func (p *Project) ReadAll(s *xorm.Session, a web.Auth, search string, page int,
projectsResult := []*Project{} projectsResult := []*Project{}
for _, p := range allProjects { for _, p := range allProjects {
if p.ParentProjectID != 0 {
if allProjects[p.ParentProjectID].ChildProjects == nil {
allProjects[p.ParentProjectID].ChildProjects = []*Project{}
}
allProjects[p.ParentProjectID].ChildProjects = append(allProjects[p.ParentProjectID].ChildProjects, p)
continue
}
projectsResult = append(projectsResult, p) projectsResult = append(projectsResult, p)
// The projects variable will contain all projects which have no parents
// And because we're using the same pointers for everything, those will contain child projects
} }
return projectsResult, resultCount, totalItems, err return projectsResult, resultCount, totalItems, err
@ -515,13 +502,11 @@ func getSavedFilterProjects(s *xorm.Session, doer *user.User) (savedFiltersProje
savedFiltersPseudoParentProject.OwnerID = doer.ID savedFiltersPseudoParentProject.OwnerID = doer.ID
savedFiltersProject = &Project{} savedFiltersProject = &Project{}
*savedFiltersProject = *savedFiltersPseudoParentProject *savedFiltersProject = *savedFiltersPseudoParentProject
savedFiltersProject.ChildProjects = make([]*Project, 0, len(savedFilters))
for _, filter := range savedFilters { for _, filter := range savedFilters {
filterProject := filter.toProject() filterProject := filter.toProject()
filterProject.ParentProjectID = savedFiltersProject.ID filterProject.ParentProjectID = savedFiltersProject.ID
filterProject.Owner = doer filterProject.Owner = doer
savedFiltersProject.ChildProjects = append(savedFiltersProject.ChildProjects, filterProject)
} }
return return