Commit8f3f0b1

committed

fix "NameError: name 'model' is not defined"; add 1 test case

1 parent0fb0711 commit8f3f0b1Copy full SHA for 8f3f0b1

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,19 @@ def test_apijson_get():`
`414`	`414`	`>>> print(d)`
`415`	`415`	`{'code': 400, 'msg': "'publicnotice' cannot filter with owner"}`
`416`	`416`
	`417`	`+ >>> #query array with OWNER`
	`418`	`+ >>> data ='''{`
	`419`	`+ ... "[]":{`
	`420`	`+ ... "comment": {`
	`421`	`+ ... "@role":"OWNER"`
	`422`	`+ ... }`
	`423`	`+ ... }`
	`424`	`+ ... }'''`
	`425`	`+ >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])`
	`426`	`+ >>> d = json_loads(r.data)`
	`427`	`+ >>> print(d)`
	`428`	`+ {'code': 200, 'msg': 'success', '[]': [{'comment': {'user_id': 1, 'to_id': 3, 'moment_id': 1, 'date': '2018-11-01 00:00:00', 'content': 'comment from admin', 'id': 1}}]}`
	`429`	`+`
`417`	`430`	`>>> #Association query: Two tables, one to one,ref path is absolute path`
`418`	`431`	`>>> data ='''{`
`419`	`432`	`... "moment":{},`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,12 +145,12 @@ def _get_array_params(self):`
`145`	`145`	`def_filter_owner(self,q):`
`146`	`146`	`owner_filtered=False`
`147`	`147`	`ifhasattr(self.model,"owner_condition"):`
`148`		`-q=q.filter(model.owner_condition())`
	`148`	`+q=q.filter(self.model.owner_condition(request.user.id))`
`149`	`149`	`owner_filtered=True`
`150`	`150`	`ifnotowner_filtered:`
`151`	`151`	`user_id_field=self.setting.get("user_id_field")`
`152`	`152`	`ifuser_id_field:`
`153`		`-q=q.filter(getattr(model.c,user_id_field)==request.user.id)`
	`153`	`+q=q.filter(getattr(self.model.c,user_id_field)==request.user.id)`
`154`	`154`	`owner_filtered=True`
`155`	`155`	`ifnotowner_filtered:`
`156`	`156`	`raiseUliwebError("'%s' cannot filter with owner"%(self.name))`

Comments

(0)