Skip to content

同步 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 2 commits into from
Dec 29, 2018
Merged

同步 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7228135
add apijson head support and example; make the request setting check …
zhangchunlin Dec 29, 2018
89702f0
now apijson get OWNER role should be given in parameters explicitly; …
zhangchunlin Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions demo/apps/apijson_demo/settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] },
Expand Down
20 changes: 20 additions & 0 deletions demo/apps/apijson_demo/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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}},
Expand All @@ -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')}}"
Expand Down Expand Up @@ -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
}
Expand Down
25 changes: 21 additions & 4 deletions demo/apps/apijson_demo/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}''',
},
Expand All @@ -40,7 +44,8 @@ def index():
"@page":0,
"user":{
"@column":"id,username,nickname,email",
"@order":"id-"
"@order":"id-",
"@role":"ADMIN"
}
}
}''',
Expand All @@ -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",
Expand Down Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions uliweb_apijson/apijson/settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] },
Expand Down
Loading