DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Find now returns all, not just non-record pages, push orphaned pages to root

Browse Source
This commit is contained in:
Denis Arh 2018-12-12 11:17:54 +01:00
parent d0398ec56f
commit 6204c7ffdf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crm/repository/page.go
View File

@ -68,9 +68,8 @@ func (r *page) FindBySelfID(selfID uint64) (types.PageSet, error) {
return pages, nil
}
// Find returns all of non-record pages
func (r *page) Find() (set types.PageSet, err error) {
return set, r.db().Select(&set, "SELECT * FROM crm_page WHERE module_id = 0 ORDER BY self_id, weight ASC")
return set, r.db().Select(&set, "SELECT * FROM crm_page ORDER BY self_id, weight ASC")
}
func (r *page) Reorder(selfID uint64, pageIDs []uint64) error {

4
crm/service/page.go
View File

@ -107,7 +107,9 @@ func (s *page) Tree() (pages types.PageSet, err error) {
c.Children = append(c.Children, p)
} else {
// Ignore orphans :(
// Move orphans to root
p.SelfID = 0
tree = append(tree, p)
}
return nil