Inicio Explorar Ayuda
Registro Iniciar sesión
Kodo
/
kodo
Vigilar 2
Destacar 0
Fork 0

Explorar el Código
Add authority field for GroupUserInfo

Brightcells %!s(int64=8) %!d(string=hace) años
padre
7d92e79eb9
commit
88f0697a89
Se han modificado 3 ficheros con 35 adiciones y 3 borrados
Mostrar Estadísticas de Diff
  1. 19 0
      group/migrations/0027_groupuserinfo_authority.py
  2. 2 0
      group/models.py
  3. 14 3
      group/tourguidegroupuser_views.py

+ 19 - 0
group/migrations/0027_groupuserinfo_authority.py
Ver Fichero 

@@ -0,0 +1,19 @@
1 
+# -*- coding: utf-8 -*-
2 
+from __future__ import unicode_literals
3 
+
4 
+from django.db import models, migrations
5 
+
6 
+
7 
+class Migration(migrations.Migration):
8 
+
9 
+    dependencies = [
10 
+        ('group', '0026_auto_20161216_1301'),
11 
+    ]
12 
+
13 
+    operations = [
14 
+        migrations.AddField(
15 
+            model_name='groupuserinfo',
16 
+            name='authority',
17 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u6709\u5b9a\u4f4d\u6743\u9650', verbose_name='authority'),
18 
+        ),
19 
+    ]

+ 2 - 0
group/models.py
Ver Fichero 

@@ -139,6 +139,7 @@ class GroupUserInfo(CreateUpdateMixin):
139 139 
     name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'用户姓名')
140 140 
     phone = models.CharField(_(u'phone'), max_length=255, blank=True, null=True, help_text=u'用户电话')
141 141 
     relative_persons = models.IntegerField(_(u'relative_persons'), default=1, help_text=u'关联人数')
142 
+    authority = models.BooleanField(_(u'authority'), default=True, help_text=u'是否有定位权限')
142 143 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
143 144
144 145 
     class Meta:
 
@@ -159,6 +160,7 @@ class GroupUserInfo(CreateUpdateMixin):
159 160 
             'name': self.name,
160 161 
             'phone': self.phone,
161 162 
             'relative_persons': self.relative_persons,
163 
+            'authority': self.authority,
162 164 
             'remark': self.remark,
163 165 
         }
164 166

+ 14 - 3
group/tourguidegroupuser_views.py
Ver Fichero 

@@ -33,6 +33,7 @@ def tgu_group_user_join_api(request):
33 33 
     name = request.POST.get('name', '')
34 34 
     phone = request.POST.get('phone', '')
35 35 
     relative_persons = request.POST.get('relative_persons', '')
36 
+    authority = bool(int(request.POST.get('authority', 1)))
36 37 
     remark = request.POST.get('remark', '')
37 38
38 39 
     # 获取旅行团唯一标识
 
@@ -62,6 +63,7 @@ def tgu_group_user_join_api(request):
62 63 
             'name': name,
63 64 
             'phone': phone,
64 65 
             'relative_persons': relative_persons,
66 
+            'authority': authority,
65 67 
             'remark': remark,
66 68 
         }
67 69 
     )
 
@@ -70,6 +72,7 @@ def tgu_group_user_join_api(request):
70 72 
         group_user.name = name
71 73 
         group_user.phone = phone
72 74 
         group_user.relative_persons = relative_persons
75 
+        group_user.authority = authority
73 76 
         group_user.remark = remark
74 77 
         group_user.save()
75 78 
 
@@ -113,6 +116,7 @@ def tgu_group_user_update_api(request):
113 116 
     name = request.POST.get('name', '')
114 117 
     phone = request.POST.get('phone', '')
115 118 
     relative_persons = request.POST.get('relative_persons', '')
119 
+    authority = bool(int(request.POST.get('authority', 1)))
116 120 
     remark = request.POST.get('remark', '')
117 121
118 122 
     # 群组校验
 
@@ -122,9 +126,14 @@ def tgu_group_user_update_api(request):
122 126 
         return response(GroupStatusCode.GROUP_NOT_FOUND)
123 127
124 128 
     # 权限校验
125 
-    if not GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, status=True).exists():
126 
-        return response(GroupStatusCode.NO_UPDATE_PERMISSION)
127 
-
129 
+    if admin_id:
130 
+        if not GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, status=True).exists():
131 
+            return response(GroupStatusCode.NO_UPDATE_PERMISSION)
132 
+    else:
133 
+        if not GroupUserInfo.objects.filter(group_id=group_id, user_id=user_id, status=True).exists():
134 
+            return response(GroupStatusCode.NO_UPDATE_PERMISSION)
135 
+
136 
+    # 权限
128 137 
     try:
129 138 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, status=True)
130 139 
     except GroupUserInfo.DoesNotExist:
 
@@ -138,6 +147,8 @@ def tgu_group_user_update_api(request):
138 147 
         group_user.phone = phone
139 148 
     if relative_persons:
140 149 
         group_user.relative_persons = relative_persons
150 
+    if authority:
151 
+        group_user.authority = authority
141 152 
     if remark:
142 153 
         group_user.remark = remark
143 154 
     group_user.save()