forked from rDrama/rDrama
fix api 500 errors
parent
b1db5a008b
commit
bc4074f9aa
|
@ -295,8 +295,6 @@ class Comment(Base):
|
||||||
|
|
||||||
if self.level >= 2: data['parent_comment_id'] = self.parent_comment_id
|
if self.level >= 2: data['parent_comment_id'] = self.parent_comment_id
|
||||||
|
|
||||||
data['replies'] = [x.json_core for x in self.replies()]
|
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -313,6 +311,7 @@ class Comment(Base):
|
||||||
if self.level >= 2:
|
if self.level >= 2:
|
||||||
data["parent"]=self.parent.json_core
|
data["parent"]=self.parent.json_core
|
||||||
|
|
||||||
|
data['replies'] = [x.json_core for x in self.replies()]
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,7 @@ class Submission(Base):
|
||||||
|
|
||||||
|
|
||||||
if "replies" in self.__dict__:
|
if "replies" in self.__dict__:
|
||||||
data["replies"]=[x.json_core for x in self.replies]
|
data["replies"]=[x.json for x in self.replies]
|
||||||
|
|
||||||
if "voted" in self.__dict__:
|
if "voted" in self.__dict__:
|
||||||
data["voted"] = self.voted
|
data["voted"] = self.voted
|
||||||
|
|
|
@ -30,7 +30,7 @@ def unread(v):
|
||||||
n.read = True
|
n.read = True
|
||||||
g.db.add(n)
|
g.db.add(n)
|
||||||
|
|
||||||
return {"data":[x[1].json for x in listing]}
|
return {"data":[x[1].json_core for x in listing]}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue