Merge pull request #40 from zhangchunlin/master

Sync

Author: TommyLemon

Diff for: tests/demo/apps/apijson_demo/dbinit.py

@@ -83,6 +83,13 @@
 ]
 
 comment_list = [
+    {
+        "username" : "admin",
+        "to_username" : "userb",
+        "moment_id" : 1,
+        "date" : "2018-11-1",
+        "content" : "comment from admin",
+    },
     {
         "username" : "usera",
         "to_username" : "userb",

Diff for: tests/demo/apps/apijson_demo/models.py

@@ -16,6 +16,11 @@ class Moment(Model):
     content = Field(TEXT)
     picture_list = Field(JSON, default=[])
 
+    @classmethod
+    def owner_condition(cls,user_id):
+        print("Moment: owner_condition")
+        return cls.c.user_id==user_id
+
 class Comment(Model):
     user_id = Reference("user")
     to_id = Reference("user")