Skip to content
Snippets Groups Projects
Commit 6102b385b8a3 authored by Sandrine Ribeau's avatar Sandrine Ribeau
Browse files

[entities] fix previous_entity and next_entity methods since entry_of is an optional relation

parent c12f85ec602f
No related branches found
No related tags found
No related merge requests found
...@@ -100,11 +100,17 @@ ...@@ -100,11 +100,17 @@
# IPrevNext interface ##################################################### # IPrevNext interface #####################################################
def next_entity(self): def next_entity(self):
rql = ('Any B ORDERBY B ASC LIMIT 1 ' if self.entry_of:
'WHERE B is BlogEntry, B entry_of BL, BL eid %(blog)s, ' rql = ('Any B ORDERBY B ASC LIMIT 1 '
'B eid > %(eid)s') 'WHERE B is BlogEntry, B entry_of BL, BL eid %(blog)s, '
rset = self.req.execute(rql, {'blog': self.entry_of[0].eid, 'eid': self.eid}) 'B eid > %(eid)s')
rset = self.req.execute(rql, {'blog': self.entry_of[0].eid, 'eid': self.eid})
else:
rql = ('Any B ORDERBY B ASC LIMIT 1 '
'WHERE B is BlogEntry, B eid > %(eid)s')
rset = self.req.execute(rql, {'eid': self.eid})
if rset: if rset:
return rset.get_entity(0,0) return rset.get_entity(0,0)
def previous_entity(self): def previous_entity(self):
...@@ -107,11 +113,16 @@ ...@@ -107,11 +113,16 @@
if rset: if rset:
return rset.get_entity(0,0) return rset.get_entity(0,0)
def previous_entity(self): def previous_entity(self):
rql = ('Any B ORDERBY B DESC LIMIT 1 ' if self.entry_of:
'WHERE B is BlogEntry, B entry_of BL, BL eid %(blog)s, ' rql = ('Any B ORDERBY B DESC LIMIT 1 '
'B eid < %(eid)s') 'WHERE B is BlogEntry, B entry_of BL, BL eid %(blog)s, '
rset = self.req.execute(rql, {'blog': self.entry_of[0].eid, 'eid': self.eid}) 'B eid < %(eid)s')
rset = self.req.execute(rql, {'blog': self.entry_of[0].eid, 'eid': self.eid})
else:
rql = ('Any B ORDERBY B DESC LIMIT 1 '
'WHERE B is BlogEntry, B eid < %(eid)s')
rset = self.req.execute(rql, {'eid': self.eid})
if rset: if rset:
return rset.get_entity(0,0) return rset.get_entity(0,0)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment