Skip to content

Commit 8f3f0b1

Browse files
committed
fix "NameError: name 'model' is not defined"; add 1 test case
1 parent 0fb0711 commit 8f3f0b1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

Diff for: tests/test.py

+13
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,19 @@ def test_apijson_get():
414414
>>> print(d)
415415
{'code': 400, 'msg': "'publicnotice' cannot filter with owner"}
416416
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+
417430
>>> #Association query: Two tables, one to one,ref path is absolute path
418431
>>> data ='''{
419432
... "moment":{},

Diff for: uliweb_apijson/apijson/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ def _get_array_params(self):
145145
def _filter_owner(self,q):
146146
owner_filtered = False
147147
if hasattr(self.model,"owner_condition"):
148-
q = q.filter(model.owner_condition())
148+
q = q.filter(self.model.owner_condition(request.user.id))
149149
owner_filtered = True
150150
if not owner_filtered:
151151
user_id_field = self.setting.get("user_id_field")
152152
if user_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)
154154
owner_filtered = True
155155
if not owner_filtered:
156156
raise UliwebError("'%s' cannot filter with owner"%(self.name))

0 commit comments

Comments
 (0)