|
|
|
@@ -6,14 +6,14 @@ from group.models import GroupInfo, GroupUserInfo
|
|
6
|
6
|
|
|
7
|
7
|
|
|
8
|
8
|
def is_group_admin(group_id, admin_id):
|
|
9
|
|
- return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, admin=True, status=True).exists()
|
|
|
9
|
+ return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, admin=True, admin_status=True, status=True).exists()
|
|
10
|
10
|
|
|
11
|
11
|
|
|
12
|
12
|
def is_group_subadmin(group_id, admin_id):
|
|
13
|
|
- return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, status=True).exists()
|
|
|
13
|
+ return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, admin_status=True, status=True).exists()
|
|
14
|
14
|
|
|
15
|
15
|
|
|
16
|
16
|
def have_active_group(user_id):
|
|
17
|
|
- groups = GroupUserInfo.objects.filter(user_id=user_id, subadmin=True, status=True)
|
|
|
17
|
+ groups = GroupUserInfo.objects.filter(user_id=user_id, subadmin=True, admin_status=True, status=True)
|
|
18
|
18
|
groupids = [group.group_id for group in groups]
|
|
19
|
19
|
return GroupInfo.objects.filter(group_id__in=groupids, group_closed=False, status=True, ended_at__gt=tc.utc_datetime()).exists()
|