Merge pull request #42 from zhangchunlin/master

Sync

Author: TommyLemon

Diff for: CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+- 0.2.1(2019-10-22)
+  - **apison-post: modify to be same with original apijson, just return "id" and "count", not other fields**
+  - apijson-table: fix key and title problem in viewedit_items
+  - apijson-viewedit: fix @role
+  - apijson-table: fix apijson-put and apijson-delete @role not work problem
+  - doc: add difference in tag parameter in apijson post/put
+  - **tests: add 97 test cases, and fix bugs found by tests**
+  - fix "NameError: name 'log' is not defined"
+  - fix py2/3 compatible
+  - fix  issue #4 :"NameError: name 'UliwebError' is not defined"
+  - apijson-table: add hook_add, for customizing the add action in apijson-table component
 - 0.2.0(2019-09-17)
   - setup: add fix utf8 for reading file
   - **fix json response structure to be same as original apijson api (java)**

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

@@ -31,3 +31,7 @@ class Comment(Model):
 class PublicNotice(Model):
     date = Field(datetime.datetime, auto_now_add=True)
     content = Field(TEXT)
+
+class NoRequestTag(Model):
+    user_id = Reference("user")
+    content = Field(TEXT)

Diff for: tests/demo/apps/apijson_demo/settings.ini

@@ -3,6 +3,7 @@ privacy = 'apijson_demo.models.Privacy'
 comment = 'apijson_demo.models.Comment'
 moment = 'apijson_demo.models.Moment'
 publicnotice = 'apijson_demo.models.PublicNotice'
+norequesttag = 'apijson_demo.models.NoRequestTag'
 
 [APIJSON_MODELS]
 user = {
@@ -42,8 +43,8 @@ publicnotice = {
     "GET" : { "roles" : ["OWNER","LOGIN","ADMIN","UNKNOWN"] },
     "HEAD" : { "roles" : ["OWNER","LOGIN","ADMIN","UNKNOWN"] },
     "POST" : { "roles" : ["OWNER","ADMIN"] },
-    "PUT" : { "roles" : ["OWNER","ADMIN"] },
-    "DELETE" : { "roles" : ["OWNER","ADMIN"] },
+    "PUT" : { "roles" : ["OWNER","ADMIN","UNKNOWN"] },
+    "DELETE" : { "roles" : ["OWNER","ADMIN","UNKNOWN"] },
 }
 
 [APIJSON_REQUESTS]
@@ -68,5 +69,12 @@ comment = {
     "PUT" :{
         "ADD":{"@role": "OWNER"},
         "NECESSARY" : ["id","content"],
+        "DISALLOW" : ["user_id","to_id"],
     },
 }
+
+publicnotice = {
+    "PUT" :{
+        "NECESSARY" : ["id","content"],
+    }
+}