Merge pull request #32 from gerdemann/bugfix/NeosUpdate

Apply migrations and fix PaginationArrayImplementation
Flowpack · May 4, 2018 · 9b3f114 · 9b3f114
2 parents 0a6e40f + 4095c08
commit 9b3f114
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/Classes/Fusion/PaginationArrayImplementation.php b/Classes/Fusion/PaginationArrayImplementation.php
@@ -11,10 +11,10 @@ class PaginationArrayImplementation extends AbstractFusionObject
 	 */
 	public function evaluate()
 	{
-		$maximumNumberOfLinks = $this->tsValue('maximumNumberOfLinks') - 2;
-		$itemsPerPage = $this->tsValue('itemsPerPage');
-		$totalCount = $this->tsValue('totalCount');
-		$currentPage = $this->tsValue('currentPage');
+		$maximumNumberOfLinks = $this->fusionValue('maximumNumberOfLinks') - 2;
+		$itemsPerPage = $this->fusionValue('itemsPerPage');
+		$totalCount = $this->fusionValue('totalCount');
+		$currentPage = $this->fusionValue('currentPage');
 		if ($totalCount > 0 !== true) {
 			return [];
 		}

diff --git a/Resources/Private/Fusion/Pagination.fusion b/Resources/Private/Fusion/Pagination.fusion
@@ -42,7 +42,7 @@ prototype(Flowpack.Listable:Pagination) < prototype(Neos.Fusion:Component) {
                 renderer = Neos.Fusion:Tag {
                     @process.tmpl = ${'<li class="' + props.itemClass + '">' + value + '</li>'}
                     tagName = 'a'
-                    attributes.href = NodeUri {
+                    attributes.href = Neos.Neos:NodeUri {
                         node = ${documentNode}
                         additionalParams = Flowpack.Listable:PaginationParameters {
                             currentPage = ${i}

diff --git a/composer.json b/composer.json
@@ -78,7 +78,20 @@
             "Neos.Neos-20161219094403",
             "Neos.Neos-20161219122512",
             "Neos.Fusion-20161219130100",
-            "Neos.Neos-20161220163741"
+            "Neos.Neos-20161220163741",
+            "TYPO3.Neos.NodeTypes-201309111655",
+            "Neos.NodeTypes-20161125002300",
+            "Neos.NodeTypes-20161125104800",
+            "Neos.SwiftMailer-20161130105617",
+            "Neos.ContentRepository.Search-20161210231100",
+            "Neos.Neos-20170115114620",
+            "Neos.Fusion-20170120013047",
+            "Neos.Flow-20170125103800",
+            "Neos.Seo-20170127154600",
+            "Neos.Flow-20170127183102",
+            "Neos.Fusion-20180211175500",
+            "Neos.Fusion-20180211184832",
+            "Neos.Flow-20180415105700"
         ]
     }
-}
+}