Make sure getNextItem/getPreviousItem return None if position can not…

… be looked up.
plone · Apr 15, 2020 · bac0225 · bac0225
1 parent 5dc8acd
commit bac0225
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/news/308.bugfix b/news/308.bugfix
@@ -0,0 +1 @@
+Make sure getNextItem/getPreviousItem return None if position can not be looked up. [timo]
diff --git a/plone/app/dexterity/behaviors/nextprevious.py b/plone/app/dexterity/behaviors/nextprevious.py
@@ -85,6 +85,8 @@ def getNextItem(self, obj):
         if not self.order:
             return None
         pos = self.context.getObjectPosition(obj.getId())
+        if not pos:
+            return None
         for oid in self.order[pos + 1:]:
             data = self.getData(self.context[oid])
             if data:
@@ -96,6 +98,8 @@ def getPreviousItem(self, obj):
             return None
         order_reversed = list(reversed(self.order))
         pos = order_reversed.index(obj.getId())
+        if not pos:
+            return None
         for oid in order_reversed[pos + 1:]:
             data = self.getData(self.context[oid])
             if data: