zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
shijing 2022-04-27 17:14:56 +08:00
parent 1c2f425e78 6aa01443ea
commit 60a27f9a21
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hb_server/apps/inm/views.py
View File

@ -82,8 +82,7 @@ class FIFOItemViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Updat
""" """
出入库记录详情表 出入库记录详情表
""" """
perms_map = {'get': '*', 'post':'fifoitem_create', perms_map = {'*':'*'}
'put':'fifoitem_update', 'delete':'fifoitem_delete'}
queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all() queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all()
serializer_class = FIFOItemSerializer serializer_class = FIFOItemSerializer
filterset_fields = ['material', 'fifo', filterset_fields = ['material', 'fifo',

12
hb_server/apps/system/permission.py
View File

@ -8,17 +8,21 @@ def get_permission_list(user):
""" """
获取权限列表,可用redis存取 获取权限列表,可用redis存取
""" """
perms_list = ['visitor'] perms_list = []
if user.is_superuser: if user.is_superuser:
perms_list = ['admin'] perms_list = ['admin']
else: else:
perms = Permission.objects.none() perms = Permission.objects.filter()
roles = user.roles.all() roles = user.roles.all()
if roles: if roles:
for i in roles: for i in roles:
perms = perms | i.perms.all() perms = perms | i.perms.all()
perms_list = perms.values_list('method', flat=True) perms_list_l = perms.values_list('method', flat=True)
perms_list = list(set(perms_list)) for i in perms_list_l:
if i and i not in perms_list:
perms_list.append(i)
if len(perms_list) == 0:
perms_list = ['visitor']
cache.set(user.username + '__perms', perms_list, 60*60) cache.set(user.username + '__perms', perms_list, 60*60)
return perms_list return perms_list