Merge pull request #12 from zhangchunlin/master

TommyLemon · web-flow · commit ea3cf4832406 · 2019-01-14T15:14:46.000+08:00
When role is UNKNOWN,  don't invoke has_role, so don't need to be dep…
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -69,7 +69,9 @@ def _get_one(self,key):
                 params_role = "UNKNOWN"
         if params_role not in roles:
             return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
-        if functions.has_role(request.user,params_role):
+        if params_role == "UNKNOWN":
+            permission_check_ok = True
+        elif functions.has_role(request.user,params_role):
             permission_check_ok = True
         else:
             return json({"code":400,"msg":"user doesn't have role '%s'"%(params_role)})
@@ -178,7 +180,9 @@ def _get_array(self,key):
                 params_role = "UNKNOWN"
         if params_role not in roles:
             return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
-        if functions.has_role(request.user,params_role):
+        if params_role == "UNKNOWN":
+            permission_check_ok = True
+        elif functions.has_role(request.user,params_role):
             permission_check_ok = True
         else:
             return json({"code":400,"msg":"user doesn't have role '%s'"%(params_role)})
@@ -273,7 +277,9 @@ def _head(self,key):
                 params_role = "UNKNOWN"
         if params_role not in roles:
             return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
-        if functions.has_role(request.user,params_role):
+        if params_role == "UNKNOWN":
+            permission_check_ok = True
+        elif functions.has_role(request.user,params_role):
             permission_check_ok = True
         else:
             return json({"code":400,"msg":"user doesn't have role '%s'"%(params_role)})
@@ -358,6 +364,9 @@ def _post_one(self,key,tag):
                                 #need OWNER, but don't know how to set user id
                                 return json({"code":400,"msg":"no permission"})
                             break
+                    elif role == "UNKNOWN":
+                        permission_check_ok = True
+                        break
                     else:
                         if functions.has_role(request.user,role):
                             permission_check_ok = True
@@ -466,6 +475,9 @@ def _put_one(self,key,tag):
                                     break
                         else:
                             return json({"code":400,"msg":"need login user"})
+                    elif role == "UNKNOWN":
+                        permission_check_ok = True
+                        break
                     else:
                         if functions.has_role(request.user,role):
                             permission_check_ok = True
@@ -564,6 +576,9 @@ def _delete_one(self,key,tag):
                                     break
                         else:
                             return json({"code":400,"msg":"need login user"})
+                    elif role == "UNKNOWN":
+                        permission_check_ok = True
+                        break
                     else:
                         if functions.has_role(request.user,role):
                             permission_check_ok = True
