Fix style

This commit is contained in:
swevm
2021-01-19 18:16:23 +01:00
parent 643e66560c
commit 861aea95ab
3 changed files with 14 additions and 13 deletions

View File

@ -139,7 +139,7 @@ class HasPermission:
async def __call__(self, resource: str = Path(...), user=Depends(get_current_user)): async def __call__(self, resource: str = Path(...), user=Depends(get_current_user)):
if not app.permission or user.is_superuser: if not app.permission or user.is_superuser:
return True #Hmm. Should superuser really cirumvent all permission checks. not a good practice!?!?!?!!?!!! return True # Hmm. Should superuser really cirumvent all permission checks. not a good practice!?!?!?!!?!!!
if not user.is_active: if not user.is_active:
return False return False
has_permission = False has_permission = False
@ -154,4 +154,4 @@ class HasPermission:
has_read_permission = HasPermission(action=enums.PermissionAction.read) has_read_permission = HasPermission(action=enums.PermissionAction.read)
has_create_permission = HasPermission(action=enums.PermissionAction.create) has_create_permission = HasPermission(action=enums.PermissionAction.create)
has_update_permission = HasPermission(action=enums.PermissionAction.update) has_update_permission = HasPermission(action=enums.PermissionAction.update)
has_delete_permission = HasPermission(action=enums.PermissionAction.delete) has_delete_permission = HasPermission(action=enums.PermissionAction.delete)

View File

@ -20,18 +20,17 @@ from ..depends import (
admin_log_update, admin_log_update,
create_checker, create_checker,
delete_checker, delete_checker,
get_current_user,
get_model, get_model,
get_query, get_query,
has_create_permission,
has_delete_permission,
has_read_permission,
has_update_permission,
parse_body, parse_body,
read_checker, read_checker,
update_checker, update_checker,
has_create_permission,
has_read_permission,
has_update_permission,
has_delete_permission,
get_current_user,
) )
from ..factory import app from ..factory import app
from ..filters import get_filter_by_name from ..filters import get_filter_by_name
from ..responses import GetManyOut from ..responses import GetManyOut
@ -129,13 +128,14 @@ async def form(resource: str,):
@router.get("/{resource}/grid", dependencies=[Depends(read_checker)]) @router.get("/{resource}/grid", dependencies=[Depends(read_checker)])
async def grid(resource: str,user=Depends(get_current_user)): async def grid(resource: str, user=Depends(get_current_user)):
resource = await app.get_resource(resource) resource = await app.get_resource(resource)
resource = resource.dict(by_alias=True, exclude_unset=True) resource = resource.dict(by_alias=True, exclude_unset=True)
resource['fields']['_actions'] = \ resource["fields"]["_actions"] = {
{'delete': await has_delete_permission(resource, user), "delete": await has_delete_permission(resource, user),
'edit': await has_update_permission(resource, user), "edit": await has_update_permission(resource, user),
'toolbar': {'create': await has_create_permission(resource, user)}} "toolbar": {"create": await has_create_permission(resource, user)},
}
return resource return resource

View File

@ -58,6 +58,7 @@ class Site(BaseModel):
header: Optional[str] header: Optional[str]
page_header: Optional[str] page_header: Optional[str]
class Field(BaseModel): class Field(BaseModel):
label: str label: str
cols: Optional[int] cols: Optional[int]