Merge pull request #7 from zhangchunlin/master

同步

Author: TommyLemon

demo/apps/apijson_demo/settings.ini

@@ -6,14 +6,16 @@ moment = 'apijson_demo.models.Moment'
 [APIJSON_MODELS]
 moment = {
     "user_id_field" : "user_id",
-    "GET" : { "roles" : ["OWNER"] },
+    "GET" : { "roles" : ["OWNER","LOGIN"] },
+    "HEAD" : { "roles" : ["OWNER","LOGIN"] },
     "POST" : { "roles" : ["OWNER"] },
     "PUT" : { "roles" : ["OWNER"] },
     "DELETE" : { "roles" : ["OWNER"] },
 }
 comment = {
     "user_id_field" : "user_id",
-    "GET" : { "roles" : ["OWNER"] },
+    "GET" : { "roles" : ["OWNER","LOGIN"] },
+    "HEAD" : { "roles" : ["OWNER","LOGIN"] },
     "POST" : { "roles" : ["OWNER"] },
     "PUT" : { "roles" : ["OWNER"] },
     "DELETE" : { "roles" : ["OWNER"] },

demo/apps/apijson_demo/templates/index.html

@@ -7,6 +7,7 @@
 <div id="app">
     <tabs v-model:value="tab_current" type="card" :animated="false">
         <tab-pane label="apijson get" name="tab_get"></tab-pane>
+        <tab-pane label="apijson head" name="tab_head"></tab-pane>
         <tab-pane label="apijson post" name="tab_post"></tab-pane>
         <tab-pane label="apijson put" name="tab_put"></tab-pane>
         <tab-pane label="apijson delete" name="tab_delete"></tab-pane>
@@ -33,6 +34,20 @@
         </i-col>
     </Row>
 
+    <Row v-if="tab_current==='tab_head'">
+        <i-col span="3"><div align="center">HTTP HEAD URL</div></i-col>
+        <i-col span="8"><i-input value="/apijson/head" readonly/></i-col>
+    </Row>
+    <Row v-if="tab_current==='tab_head'">
+        <i-col span="3"><div align="center"><strong>apijson head</strong> request examples</div></i-col>
+        <i-col span="8">
+            <i-select v-model="request_data">
+                <i-option v-for="item in request_head" :value="item.value" :key="item.value">{ item.label }</i-option>
+            </i-select>
+        </i-col>
+    </Row>
+
+
     <Row v-if="tab_current==='tab_post'">
             <i-col span="3"><div align="center">POST URL</div></i-col>
             <i-col span="8"><i-input value="/apijson/post" readonly/></i-col>
@@ -88,6 +103,7 @@
     delimiters: ['{', '}'],
     data: {
         request_get : {{=request_get_json}},
+        request_head : {{=request_head_json}},
         request_post : {{=request_post_json}},
         request_put : {{=request_put_json}},
         request_delete : {{=request_delete_json}},
@@ -97,6 +113,7 @@
         tab_current : "tab_get",
         tab2url : {
             "tab_get":"{{=url_for('uliweb_apijson.apijson.views.ApiJson.get')}}",
+            "tab_head":"{{=url_for('uliweb_apijson.apijson.views.ApiJson.head')}}",
             "tab_post":"{{=url_for('uliweb_apijson.apijson.views.ApiJson.post')}}",
             "tab_put":"{{=url_for('uliweb_apijson.apijson.views.ApiJson.put')}}",
             "tab_delete":"{{=url_for('uliweb_apijson.apijson.views.ApiJson.delete')}}"
@@ -130,6 +147,9 @@
             if (n=="tab_get") {
                 vm.request_data = vm.request_get[0].value
             }
+            else if (n=="tab_head") {
+                vm.request_data = vm.request_head[0].value
+            }
             else if (n=="tab_post") {
                 vm.request_data = vm.request_post[0].value
             }

demo/apps/apijson_demo/views.py

@@ -8,27 +8,31 @@ def index():
         user_info = "login as user '%s(%s)'"%(request.user.username,request.user)
     else:
         user_info = "not login, you can login with username 'admin/usera/userb/userc', and password '123'"
+
     request_get = [
         {
-            "label":"Single record query: no parameter",
+            "label":"Single record query: self user",
             "value":'''{
    "user":{
+       "@role":"OWNER"
    }
 }''',
         },
         {
             "label":"Single record query: with id as parameter",
             "value":'''{
    "user":{
-     "id":1
+     "id":2,
+     "@role":"ADMIN"
    }
 }''',
         },
         {
             "label":"Single record query: @column",
             "value":'''{
    "user":{
-     "@column": "id,username,email"
+     "@column": "id,username,email",
+     "@role":"OWNER"
    }
 }''',
         },
@@ -40,7 +44,8 @@ def index():
     "@page":0,
     "user":{
       "@column":"id,username,nickname,email",
-      "@order":"id-"
+      "@order":"id-",
+     "@role":"ADMIN"
     }
   }
 }''',
@@ -59,6 +64,17 @@ def index():
         },
     ]
 
+    request_head = [
+        {
+            "label":"query number of moments for one user",
+            "value":'''{
+    "moment": {
+        "user_id": 1
+    }
+}''',
+        },
+    ]
+
     request_post = [
         {
             "label":"Add new moment",
@@ -112,6 +128,7 @@ def index():
     return {
         "user_info":user_info,
         "request_get_json":dumps(request_get),
+        "request_head_json":dumps(request_head),
         "request_post_json":dumps(request_post),
         "request_put_json":dumps(request_put),
         "request_delete_json":dumps(request_delete),

uliweb_apijson/apijson/settings.ini

@@ -11,6 +11,7 @@ user = {
     "user_id_field" : "id",
     "secret_fields" : ["password"],
     "GET" : { "roles" : ["ADMIN","OWNER"] },
+    "HEAD" : { "roles" : ["ADMIN","OWNER"] },
     "POST" : { "roles" : ["ADMIN","OWNER"] },
     "PUT" : { "roles" : ["ADMIN","OWNER"] },
     "DELETE" : { "roles" : ["ADMIN","OWNER"] },