ホーム エスクプローラ ヘルプ
登録 サインイン
Kodo
/
kodo
Watch 2
Star 0
Fork 0

ソースを参照
Remove status code NO_XX_PERMISSION

Brightcells 8 年 前
親
505b2802c5
コミット
1ecd4f276f
共有5 個のファイルを変更した、8 個の追加 と 22 個の削除を含む
差分情報を表示
  1. 2 2
      group/groupuser_views.py
  2. 2 2
      group/tourguidegroup_views.py
  3. 1 1
      group/tourguidegroupuser_views.py
  4. 3 3
      group/views.py
  5. 0 14
      utils/error/errno_utils.py

+ 2 - 2
group/groupuser_views.py
ファイルの表示 

@@ -89,7 +89,7 @@ def group_user_remove_api(request):
89 89
90 90 
     # 权限校验
91 91 
     if group.admin_id != admin_id:
92 
-        return response(GroupStatusCode.NO_REMOVE_PERMISSION)
92 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
93 93
94 94 
     # 管理员也不允许将自己移除
95 95 
     if group.admin_id == user_id:
 
@@ -133,7 +133,7 @@ def group_user_quit_api(request):
133 133
134 134 
     # 权限校验
135 135 
     if group.admin_id == user_id:  # 管理员也不允许自己退出
136 
-        return response(GroupStatusCode.NO_QUIT_PERMISSION)
136 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
137 137
138 138 
     # 群组用户校验
139 139 
     try:

+ 2 - 2
group/tourguidegroup_views.py
ファイルの表示 

@@ -178,7 +178,7 @@ def tg_group_update_api(request):
178 178
179 179 
     # 权限校验
180 180 
     if group.admin_id != admin_id:
181 
-        return response(GroupStatusCode.NO_UPDATE_PERMISSION)
181 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
182 182
183 183 
     # 群组名称更新
184 184 
     if group_name:
 
@@ -229,7 +229,7 @@ def tg_group_close_api(request):
229 229
230 230 
     # 权限校验
231 231 
     if group.admin_id != admin_id:
232 
-        return response(GroupStatusCode.NO_CLOSE_PERMISSION)
232 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
233 233
234 234 
     # 群组解锁
235 235 
     group.group_closed = True

+ 1 - 1
group/tourguidegroupuser_views.py
ファイルの表示 

@@ -188,7 +188,7 @@ def tgu_group_user_update_api(request):
188 188 
             return response(GroupStatusCode.NOT_GROUP_SUBADMIN)
189 189 
     else:
190 190 
         if not GroupUserInfo.objects.filter(group_id=group_id, user_id=user_id, status=True).exists():
191 
-            return response(GroupStatusCode.NO_UPDATE_PERMISSION)
191 
+            return response(GroupStatusCode.NOT_GROUP_ADMIN)
192 192
193 193 
     # 权限
194 194 
     try:

+ 3 - 3
group/views.py
ファイルの表示 

@@ -121,7 +121,7 @@ def group_update_api(request):
121 121
122 122 
     # 权限校验
123 123 
     if group.admin_id != admin_id:
124 
-        return response(GroupStatusCode.NO_UPDATE_PERMISSION)
124 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
125 125
126 126 
     # 群组名称更新
127 127 
     if group_name:
 
@@ -209,7 +209,7 @@ def group_lock_api(request):
209 209
210 210 
     # 权限校验
211 211 
     if group.admin_id != admin_id:
212 
-        return response(GroupStatusCode.NO_LOCK_PERMISSION)
212 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
213 213
214 214 
     # 群组锁定
215 215 
     group.group_lock = True
 
@@ -235,7 +235,7 @@ def group_unlock_api(request):
235 235
236 236 
     # 权限校验
237 237 
     if group.admin_id != admin_id:
238 
-        return response(GroupStatusCode.NO_UNLOCK_PERMISSION)
238 
+        return response(GroupStatusCode.NOT_GROUP_ADMIN)
239 239
240 240 
     # 群组解锁
241 241 
     group.group_lock = False

+ 0 - 14
utils/error/errno_utils.py
ファイルの表示 

@@ -61,20 +61,6 @@ class GroupStatusCode(BaseStatusCode):
61 61 
     NOT_GROUP_ADMIN = StatusCodeField(402010, 'Not Group Admin', description=u'非群组管理员')
62 62 
     NOT_GROUP_SUBADMIN = StatusCodeField(402011, 'Not Group Sub Admin', description=u'非群组协同管理员')
63 63 
     ADMIN_CANNOT_HANDLE_SELF = StatusCodeField(402012, 'Admin Cannot Handle Self', description=u'群组管理员无法操作自身')
64 
-    # 权限
65 
-    NO_UPDATE_PERMISSION = StatusCodeField(402020, 'No Update Permission', description=u'无更新权限')
66 
-    NO_LOCK_PERMISSION = StatusCodeField(402021, 'No Lock Permission', description=u'无锁定权限')
67 
-    NO_UNLOCK_PERMISSION = StatusCodeField(402022, 'No Unlock Permission', description=u'无解锁权限')
68 
-    NO_REMOVE_PERMISSION = StatusCodeField(402023, 'No Remove Permission', description=u'无移除权限')
69 
-    NO_QUIT_PERMISSION = StatusCodeField(402024, 'No Quit Permission', description=u'无退出权限')
70 
-    NO_PASS_PERMISSION = StatusCodeField(402025, 'No Pass Permission', description=u'无通过权限')
71 
-    NO_REFUSE_PERMISSION = StatusCodeField(402026, 'No Refuse Permission', description=u'无拒绝权限')
72 
-    NO_CLOSE_PERMISSION = StatusCodeField(402027, 'No Close Permission', description=u'无关闭权限')
73 
-    NO_TRANSFER_PERMISSION = StatusCodeField(402028, 'No Transfer Permission', description=u'无转移权限')
74 
-    NO_LOCATION_PERMISSION = StatusCodeField(402029, 'No Location Permission', description=u'无地理位置权限')
75 
-    # 请求
76 
-    DUPLICATE_JOIN_REQUEST = StatusCodeField(402030, 'Duplicate Join Request', description=u'重复加群申请')
77 
-    JOIN_REQUEST_NOT_FOUND = StatusCodeField(402031, 'Join Request Not Found', description=u'加群申请不存在')
78 64 
     # 旅行团
79 65 
     ONLY_ONE_ACTIVE_GROUP_ALLOWED = StatusCodeField(402040, 'Only One Active Group Allowed', description=u'只能创建一个活跃团')
80 66 
     ACTIVE_GROUP_NOT_FOUND = StatusCodeField(402041, 'Active Group Not Found', description=u'活跃团不存在')