diff --git a/Configuration/Routes.yaml b/Configuration/Routes.yaml index 692766a..82f9666 100644 --- a/Configuration/Routes.yaml +++ b/Configuration/Routes.yaml @@ -1,6 +1,6 @@ - name: 'Paginate for Breadlesscode.Listable' - uriPattern: '{node}?={currentPage}' + uriPattern: '{node}{currentPage}' defaults: '@package': 'Neos.Neos' '@controller': 'Frontend\Node' diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 178725d..b1e4775 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -5,7 +5,7 @@ Neos: 'Breadlesscode.Listable': position: 'before Neos.Neos' variables: - parameterName: 'page' + paginationUriSeperator: '--page' defaultUriSuffix: '.html' Neos: fusion: diff --git a/Resources/Private/Fusion/Component/Collection.fusion b/Resources/Private/Fusion/Component/Collection.fusion index 5ec34c3..006714f 100644 --- a/Resources/Private/Fusion/Component/Collection.fusion +++ b/Resources/Private/Fusion/Component/Collection.fusion @@ -18,7 +18,7 @@ prototype(Breadlesscode.Listable:Collection) < prototype(Neos.Fusion:Component) execute = ${ value.execute() } } } - # default flow query implementaion + # default flow query and array implementaion default { condition = ${ true } renderer = ${ Type.instance(props.collection, 'Neos\Eel\FlowQuery\FlowQuery') ? props.collection : q(props.collection) } diff --git a/Resources/Private/Fusion/Component/List.fusion b/Resources/Private/Fusion/Component/List.fusion index 50f80cb..fea2503 100644 --- a/Resources/Private/Fusion/Component/List.fusion +++ b/Resources/Private/Fusion/Component/List.fusion @@ -6,7 +6,7 @@ prototype(Breadlesscode.Listable:List) < prototype(Neos.Fusion:Component) { paginated = ${ true } paginationConfig = Breadlesscode.Listable:PaginationConfig - @context.currentPage = ${request.arguments.currentPage || 1} + @context.currentPage = ${ request.arguments.currentPage || 1 } renderer = Neos.Fusion:Array { @context.collection = Neos.Fusion:RawArray {