diff --git a/demo/apps/apijson_demo/settings.ini b/demo/apps/apijson_demo/settings.ini index bdf19b1..fdf8f1a 100644 --- a/demo/apps/apijson_demo/settings.ini +++ b/demo/apps/apijson_demo/settings.ini @@ -13,6 +13,15 @@ moment = { "roles" : ["OWNER"] } } +comment = { + "user_id_field" : "user_id", + "rbac_get" : { + "roles" : ["OWNER"] + }, + "rbac_post" : { + "roles" : ["OWNER"] + } +} [APIJSON_REQUESTS] moment = { @@ -22,3 +31,11 @@ moment = { "NECESSARY" : ["content"] } } + +comment = { + "comment": { + "ADD" :{"@role": ["OWNER"]}, + "DISALLOW" : ["id"], + "NECESSARY" : ["content"] + } +} diff --git a/demo/apps/apijson_demo/templates/index.html b/demo/apps/apijson_demo/templates/index.html index 250d63e..bc5a16e 100644 --- a/demo/apps/apijson_demo/templates/index.html +++ b/demo/apps/apijson_demo/templates/index.html @@ -94,6 +94,15 @@ watch: { request_data : function(n,o){ vm.can_post = true + }, + tab_current : function(n,o){ + if (n=="tab_get") { + vm.request_data = vm.request_get[0].value + } + else if (n=="tab_post") { + vm.request_data = vm.request_post[0].value + } + vm.response_data = "" } } }) diff --git a/demo/apps/apijson_demo/views.py b/demo/apps/apijson_demo/views.py index 1639683..6c9ca5c 100644 --- a/demo/apps/apijson_demo/views.py +++ b/demo/apps/apijson_demo/views.py @@ -33,7 +33,7 @@ def index(): }''', }, { - "label":"Array query", + "label":"Array query: user", "value":'''{ "[]":{ "@count":2, @@ -43,6 +43,18 @@ def index(): "@order":"id-" } } +}''', + }, + { + "label":"Array query: moment", + "value":'''{ + "[]":{ + "@count":10, + "@page":0, + "moment":{ + "@order":"id-" + } + } }''', }, ] @@ -58,6 +70,16 @@ def index(): ] }, "@tag": "moment" +}''', + }, + { + "label":"Add new comment", + "value":'''{ + "comment": { + "moment_id": 1, + "content": "new test comment" + }, + "tag": "comment" }''', }, ] diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py index 5945cad..8b27021 100644 --- a/uliweb_apijson/apijson/views.py +++ b/uliweb_apijson/apijson/views.py @@ -150,7 +150,7 @@ def _get_array(self,key): #model settings model_setting = settings.APIJSON_MODELS.get(modelname,{}) - secret_fields = model_setting["secret_fields"] + secret_fields = model_setting.get("secret_fields") #model params #column