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

删除grouptype3

This commit is contained in:
caoqianming 2021-05-26 16:20:42 +08:00
parent fbdacce0b5
commit 705bf13343
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
groups/views.py
View File

@ -183,7 +183,7 @@ class CompanyCreateView(CreateView):
menus = list(role.permissions.all().values_list('menuid',flat=True))
s_models.Group.objects.create(groupname='超管', grouptype=0, usecomp=obj, menulist=menus)
s_models.Group.objects.create(groupname='安全员', grouptype=1, usecomp=obj, menulist=menus)
s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=menus)
# s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=[11])
z = s_models.Group.objects.create(groupname='主管', grouptype=2,usecomp=obj, menulist=menus)
z.users.add(adminuser)
s_models.Yjsetup.objects.create(monthyhavg=100, safev=50, warnv=75, alertv=100, maxv=200, yhpgqz=4,

12
safesite/views.py
View File

@ -2814,8 +2814,8 @@ def userhandle(req):
# if i.grouptype == 1:
# i.users.add(a)
Group.objects.get(usecomp__partid=companyid,
grouptype=3).users.add(a)
# Group.objects.get(usecomp__partid=companyid,
# grouptype=3).users.add(a)
return JsonResponse({"code": 1})
else:
return JsonResponse({"code": 0})
@ -3936,8 +3936,6 @@ def apicompany(req):
groupname='超管', grouptype=0, usecomp=part, menulist=menurights)
Group.objects.create(
groupname='安全员', grouptype=1, usecomp=part, menulist=menurights)
Group.objects.create(
groupname='全体用户', grouptype=3, usecomp=part, menulist=menurights)
z = Group(groupname='主管', grouptype=2,
usecomp=part, menulist=menurights)
z.save()
@ -4646,7 +4644,7 @@ def apiuser(req):
user = User.objects.get(userid=ruserid)
user.deletemark=1
user.save()
Group.objects.get(usecomp=user.usecomp,grouptype=3).users.add(user)#授予基本权限
# Group.objects.get(usecomp=user.usecomp,grouptype=3).users.add(user)#授予基本权限
return JsonResponse({"code": 1})
elif a == 'updateHeadimg':
userid = req.GET.get('userid')
@ -4968,8 +4966,8 @@ def apitool(req):
user.save()
for i in Group.objects.filter(usecomp=usecomp):
i.users.remove(user)
groupobj = Group.objects.filter(usecomp=usecomp, grouptype=3).first()
groupobj.users.add(user)
# groupobj = Group.objects.filter(usecomp=usecomp, grouptype=3).first()
# groupobj.users.add(user)
return JsonResponse({"code": 1})
elif a == 'correctionzs':
objs = Socertificate.objects.all()