# ALTER TABLE group_groupphotoinfo MODIFY COLUMN nickname VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL; 151 
-            # group.PhotoCommentInfo ==> nickname
152 
-            #   ALTER TABLE group_photocommentinfo MODIFY COLUMN nickname VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL;
153 
-            # group.PhotoThumbUpInfo ==> nickname
154 
-            #   ALTER TABLE group_photothumbupinfo MODIFY COLUMN nickname VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL;
155 
-            # group.UserMessageInfo ==> nickname
156 
-            #   ALTER TABLE message_usermessageinfo MODIFY COLUMN from_nickname VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL;
157 
-            #
158 
-            # Comment
159 
-            # group.PhotoCommentInfo ==> comment
160 
-            #   ALTER TABLE group_photocommentinfo MODIFY COLUMN comment LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
161 147 
             'charset': 'utf8mb4',
162 148 
         },
163 149 
     }

+ 1 - 1
mch/models.py
查看文件 

@@ -534,7 +534,7 @@ class MaintenancemanInfo(BaseModelMixin, SexModelMixin):
534 534
535 535 
     class Meta:
536 536 
         verbose_name = _(u'维修员信息')
537 
-        verbose_name_plural = _(u'维修员信息信息')
537 
+        verbose_name_plural = _(u'维修员信息')
538 538
539 539 
         unique_together = (
540 540 
             ('maintenance_phone', 'brand_id'),

+ 3 - 14
utils/admin_utils.py
查看文件 

@@ -1,18 +1,7 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-from group.models import GroupInfo, GroupUserInfo
4 
-from TimeConvert import TimeConvert as tc
3 
+from mch.models import MaintenancemanInfo
5 4
6 5
7 
-def is_group_admin(group_id, admin_id):
8 
-    return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, admin=True, admin_status=True, status=True).exists()
9 
-
10 
-
11 
-def is_group_subadmin(group_id, admin_id):
12 
-    return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, admin_status=True, status=True).exists()
13 
-
14 
-
15 
-def have_active_group(user_id):
16 
-    groups = GroupUserInfo.objects.filter(user_id=user_id, subadmin=True, admin_status=True, status=True)
17 
-    groupids = [group.group_id for group in groups]
18 
-    return GroupInfo.objects.filter(group_id__in=groupids, group_closed=False, status=True, ended_at__gt=tc.utc_datetime()).exists()
6 
+def is_maintenanceman(brand_id, user_id):
7 
+    return MaintenancemanInfo.objects.filter(brand_id=brand_id, user_id=user_id, status=True).exists()

+ 1 - 0
utils/error/errno_utils.py
查看文件 

@@ -121,6 +121,7 @@ class ExpressStatusCode(BaseStatusCode):
121 121 
 class MaintenaceStatusCode(BaseStatusCode):
122 122 
     """ 维修相关错误码 5080xx """
123 123 
     MAINTENACE_NOT_FOUND = StatusCodeField(508001, 'Maintenace Not Found', description=u'维修不存在')
124 
+    MAINTENACE_PERMISSION_DENIED = StatusCodeField(508002, 'Maintenace Permission Denied', description=u'维修权限不足')
124 125
125 126
126 127 
 class AdministratorStatusCode(BaseStatusCode):

Update Operator encryption only when password exists · b1de39086a - Gogs: Go Git Service
ホーム エスクプローラ ヘルプ
登録 サインイン
Pai2
/
pai2
Watch 2
Star 0
Fork 0

ソースを参照
Update Operator encryption only when password exists

Brightcells 8 年 前
親
89108cc8cd
コミット
b1de39086a
共有1 個のファイルを変更した、2 個の追加 と 1 個の削除を含む
差分情報を表示
  1. 2 1
      mch/admin.py

+ 2 - 1
mch/admin.py
ファイルの表示 

@@ -16,7 +16,8 @@ class OperatorInfoAdmin(admin.ModelAdmin):
16 16 
     def save_model(self, request, obj, form, change):
17 17 
         obj.phone = strip(obj.phone)
18 18 
         obj.password = strip(obj.password)
19 
-        obj.encryption = make_password(obj.password, settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)
19 
+        if obj.password:
20 
+            obj.encryption = make_password(obj.password, settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)
20 21 
         obj.password = ''
21 22
22 23 
         obj.brand_id = strip(obj.brand_id)