perf: 工单评论优化

fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题

apps/authentication/templates/authentication/login.html

@@ -147,7 +147,7 @@
                     {% csrf_token %}
                     <div style="line-height: 17px;margin-bottom: 20px;color: #999999;">
                     {% if form.errors %}
-                        <p class="help-block">
+                        <p class="help-block red-fonts">
                             {% if form.non_field_errors %}
                                 {{ form.non_field_errors.as_text }}
                             {% endif %}

apps/tickets/models/ticket.py

@@ -206,10 +206,12 @@ class Ticket(CommonModelMixin, OrgModelMixin):
         self.save()
         post_change_ticket_action.send(sender=self.__class__, ticket=self, action=action)
 
-    # ticket
+    def has_current_assignee(self, assignee):
-    def has_assignee(self, assignee):
         return self.ticket_steps.filter(ticket_assignees__assignee=assignee, level=self.approval_step).exists()
 
+    def has_all_assignee(self, assignee):
+        return self.ticket_steps.filter(ticket_assignees__assignee=assignee).exists()
+
     @classmethod
     def get_user_related_tickets(cls, user):
         queries = Q(applicant=user) | Q(ticket_steps__ticket_assignees__assignee=user)

apps/tickets/permissions/comment.py

@@ -15,4 +15,4 @@ class IsApplicant(permissions.BasePermission):
 
 class IsAssignee(permissions.BasePermission):
     def has_permission(self, request, view):
-        return view.ticket.has_assignee(request.user)
+        return view.ticket.has_all_assignee(request.user)

apps/tickets/permissions/ticket.py

@@ -3,7 +3,7 @@ from rest_framework import permissions
 
 class IsAssignee(permissions.BasePermission):
     def has_object_permission(self, request, view, obj):
-        return obj.has_assignee(request.user)
+        return obj.has_current_assignee(request.user)
 
 
 class IsApplicant(permissions.BasePermission):

apps/users/models/user.py

@@ -537,7 +537,7 @@ class MFAMixin:
         methods = []
         if self.otp_secret_key:
             methods.append(MFAType.OTP)
-        if self.phone:
+        if settings.XPACK_ENABLED and settings.SMS_ENABLED and self.phone:
             methods.append(MFAType.SMS_CODE)
         return methods
 

requirements/deb_buster_requirements.txt

@@ -1,5 +1,6 @@
 # common
 gcc
+g++
 cmake
 curl
 wget
@@ -12,6 +13,7 @@ default-mysql-client
 default-libmysqlclient-dev
 
 # Pillow
+libpq-dev
 libffi-dev
 # libfreetype6-dev
 # libfribidi-dev

requirements/deb_requirements.txt

@@ -1 +1 @@
-libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite libkrb5-dev sshpass libmysqlclient-dev
+g++ libpq-dev libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite libkrb5-dev sshpass libmysqlclient-dev