Skip to content

Sync #41

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 14 commits into from
Oct 12, 2019
Merged

Sync #41

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c32aa1d
fix expr determination way; remove an unnessary limit(); add 7 test c…
zhangchunlin Oct 11, 2019
dda827b
update some comment; fix "NameError: name 'model_name' is not defined…
zhangchunlin Oct 11, 2019
f0c5026
add 1 test case, now 55 test cases for apijson-get
zhangchunlin Oct 11, 2019
d2ab647
fix "AttributeError: 'Request' object has no attribute 'user'"; add 4…
zhangchunlin Oct 11, 2019
9461f44
fix "AttributeError: 'Request' object has no attribute 'user'"; add 1…
zhangchunlin Oct 11, 2019
b27ad9b
add 4 test cases for apijson-head, now 9 cases
zhangchunlin Oct 11, 2019
99812cf
fix @role support in apijson-put; add 7 test cases
zhangchunlin Oct 12, 2019
c19ebae
doc: add difference in tag parameter in apijson post/put
zhangchunlin Oct 12, 2019
425d3f8
apijson-table: fix apijson-put @role not work problem; demo: make use…
zhangchunlin Oct 12, 2019
65d9b84
apijson-table: fix apijson-post with @role
zhangchunlin Oct 12, 2019
ffdca01
apijson-table: fix @role in apijson-delete
zhangchunlin Oct 12, 2019
fbd0249
apijson-viewedit: fix @role
zhangchunlin Oct 12, 2019
66d6d27
apijson-table: fix key and title problem in viewedit_items
zhangchunlin Oct 12, 2019
cbee292
test: workaround date string convert case cause by pendulum bug: htt…
zhangchunlin Oct 12, 2019
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
Prev Previous commit
Next Next commit
apijson-viewedit: fix @ROLE
  • Loading branch information
@zhangchunlin
zhangchunlin committed Oct 12, 2019
commit fbd024929f8dcfb9a1f4da16303651f8f3f377ca
11 changes: 8 additions & 3 deletions uliweb_apijson/apijson/templates/vue/inc_apijson_viewedit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
data: function(){
return {
l_request_tag: null,
role: "{{=role}}",
role: "{{=role or ''}}",
row: {},
row_saved: {},
viewedit_items: [],
Expand All @@ -38,8 +38,10 @@
init_viewedit: function(){
var params = {}
var model_params = {
"id":this.id,
"@role":this.role
"id":this.id
}
if (this.role!='') {
model_params["@role"] = this.role
}
params[this.model_name] = model_params
var thisp = this
Expand Down Expand Up @@ -89,6 +91,9 @@
this.row[d.key] = d.value
}
}
if (this.role!='') {
record_params["@role"] = this.role
}
params[this.l_request_tag] = record_params
params = this.ajax_hook("apijson_put","update",params)
var thisp = this
Expand Down