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

zhangchunlin · zhangchunlin · commit 8f3f0b1b081e · 2019-10-10T15:54:00.000+08:00
diff --git a/tests/test.py b/tests/test.py
@@ -414,6 +414,19 @@ def test_apijson_get():
     >>> print(d)
     {'code': 400, 'msg': "'publicnotice' cannot filter with owner"}
 
+    >>> #query array with OWNER
+    >>> data ='''{
+    ...    "[]":{
+    ...         "comment": {
+    ...             "@role":"OWNER"
+    ...         }
+    ...    }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'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}}]}
+
     >>> #Association query: Two tables, one to one,ref path is absolute path
     >>> data ='''{
     ...     "moment":{},
diff --git a/uliweb_apijson/apijson/__init__.py b/uliweb_apijson/apijson/__init__.py
@@ -145,12 +145,12 @@ def _get_array_params(self):
     def _filter_owner(self,q):
         owner_filtered = False
         if hasattr(self.model,"owner_condition"):
-            q = q.filter(model.owner_condition())
+            q = q.filter(self.model.owner_condition(request.user.id))
             owner_filtered = True
         if not owner_filtered:
             user_id_field = self.setting.get("user_id_field")
             if user_id_field:
-                q = q.filter(getattr(model.c,user_id_field)==request.user.id)
+                q = q.filter(getattr(self.model.c,user_id_field)==request.user.id)
                 owner_filtered = True
         if not owner_filtered:
             raise UliwebError("'%s' cannot filter with owner"%(self.name))
