DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Don't require pageID when fetching all NS layouts

Browse Source
This commit is contained in:
Tomaž Jerman 2023-03-27 12:13:39 +02:00 committed by Jože Fortun
parent 06afbc4462
commit 8437728af1
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/compose/rest/page_layout.go
View File

@ -88,7 +88,6 @@ func (ctrl *PageLayout) ListNamespace(ctx context.Context, r *request.PageLayout
err error
f = types.PageLayoutFilter{
NamespaceID: r.NamespaceID,
PageID: r.PageID,
Labels: r.Labels,
Handle: r.Handle,

19
server/compose/service/page_layout.go
View File

@ -122,15 +122,22 @@ func (svc pageLayout) search(ctx context.Context, filter types.PageLayoutFilter)
filter.Check = checkPageLayout(ctx, svc.ac)
err = func() error {
ns, pg, err = loadPageCombo(ctx, svc.store, filter.NamespaceID, filter.PageID)
if err != nil {
return err
if filter.PageID > 0 {
ns, pg, err = loadPageCombo(ctx, svc.store, filter.NamespaceID, filter.PageID)
if err != nil {
return err
}
if !svc.ac.CanSearchPageLayoutsOnPage(ctx, pg) {
return PageLayoutErrNotAllowedToSearch()
}
} else {
ns, err = loadNamespace(ctx, svc.store, filter.NamespaceID)
if err != nil {
return err
}
}
aProps.setNamespace(ns)
if !svc.ac.CanSearchPageLayoutsOnPage(ctx, pg) {
return PageLayoutErrNotAllowedToSearch()
}
if len(filter.Labels) > 0 {
filter.LabeledIDs, err = label.Search(