Merge pull request #38 from zhangchunlin/master

TommyLemon · web-flow · commit 759caa6934f5 · 2019-10-09T17:55:38.000+08:00
Sync
diff --git a/uliweb_apijson/apijson/__init__.py b/uliweb_apijson/apijson/__init__.py
@@ -1,8 +1,10 @@
 #coding=utf-8
 
-from uliweb import settings, models, request, functions
+from uliweb import settings, models, request, functions, UliwebError
 from uliweb.orm import ModelNotFound
+import logging
 
+log = logging.getLogger('apijson')
 
 def get_apijson_tables(role="UNKNOWN"):
     from uliweb import settings
@@ -82,7 +84,7 @@ def __init__(self,name,params,parent,key):
     def _check_GET_permission(self):
         GET = self.setting.get("GET")
         if not GET:
-            raise UliwebError("'%s' not accessible by apijson"%(name))
+            raise UliwebError("'%s' not accessible by apijson"%(self.name))
     
         roles = GET.get("roles")
         params_role = self.params.get("@role")
@@ -93,7 +95,7 @@ def _check_GET_permission(self):
             else:
                 params_role = "UNKNOWN"
         if params_role not in roles:
-            raise UliwebError("'%s' not accessible by role '%s'"%(model_name,params_role))
+            raise UliwebError("'%s' not accessible by role '%s'"%(self.name,params_role))
         if params_role == "UNKNOWN":
             self.permission_check_ok = True
         elif functions.has_role(request.user,params_role):
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -1,6 +1,7 @@
 #coding=utf-8
 from uliweb import expose, functions, models, UliwebError
 from uliweb.orm import ModelNotFound
+from uliweb.utils._compat import string_types
 from sqlalchemy.sql import and_, or_, not_
 from json import loads
 from collections import OrderedDict
@@ -109,7 +110,7 @@ def _get_one(self,key):
         roles = GET.get("roles")
         permission_check_ok = False
         if not params_role:
-            if request.user:
+            if hasattr(request,"user"):
                 params_role = "LOGIN"
             else:
                 params_role = "UNKNOWN"
@@ -224,7 +225,7 @@ def _get_filter_condition(self,model,model_param,item,expr=False):
                 return self._expr(model,model_param,model_expr=item)
             else:
                 raise UliwebError("item can be array only in @expr: '%s'"%(item))
-        if not isinstance(item,str):
+        if not isinstance(item,string_types):
             raise UliwebError("item should be array or string: '%s'"%(item))
         n = item
         if n[0]=="@":
