From ffdc1eb198e347a9e09e9dd7476f296f38209384 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Fri, 22 Nov 2019 16:16:29 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=B1=BB=E5=9E=8B=E6=8E=92=E5=BA=8F=20=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=20=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tickets/serializers/ticket.py              |  2 +-
 apps/tickets/templates/tickets/ticket_list.html | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/tickets/serializers/ticket.py b/apps/tickets/serializers/ticket.py
index b7bcde25a..f148c6375 100644
--- a/apps/tickets/serializers/ticket.py
+++ b/apps/tickets/serializers/ticket.py
@@ -14,7 +14,7 @@ class TicketSerializer(serializers.ModelSerializer):
             'id', 'user', 'user_display', 'title', 'body',
             'assignees', 'assignees_display',
             'status', 'action', 'date_created', 'date_updated',
-            'type_display', 'action_display',
+            'type', 'type_display', 'action_display',
         ]
         read_only_fields = [
             'user_display', 'assignees_display',
diff --git a/apps/tickets/templates/tickets/ticket_list.html b/apps/tickets/templates/tickets/ticket_list.html
index c51d48072..dfbc973e7 100644
--- a/apps/tickets/templates/tickets/ticket_list.html
+++ b/apps/tickets/templates/tickets/ticket_list.html
@@ -67,24 +67,27 @@ function initTable() {
                  var detailBtn = '<a href="{% url "tickets:ticket-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
                  $(td).html(detailBtn.replace("{{ DEFAULT_PK }}", rowData.id));
              }},
+             {targets: 3, createdCell: function (td, cellData, rowData) {
+                 $(td).html(rowData.type_display)
+             }},
              {targets: 4, createdCell: function (td, cellData) {
                  if (cellData === "open") {
                      $(td).html('<i class="fa fa-check-circle-o text-navy"></i>');
                  } else {
                      $(td).html('<i class="fa fa-times-circle-o text-danger"></i>')
                  }
-              }},
-             {targets: 4, createdCell: function (td, cellData) {
+             }},
+             {targets: 5, createdCell: function (td, cellData) {
                  var d = toSafeLocalDateStr(cellData);
                  $(td).html(d)
-              }},
+              }}
              ],
          ajax_url: listUrl,
          columns: [
              {data: "id"}, {data: "title"},
-             {data: "user_display"}, {data: "type_display"},
+             {data: "user_display"}, {data: "type"},
              {data: "status", width: "40px"},
-             {data: "date_created"},
+             {data: "date_created"}
          ],
          op_html: $('#actions').html()
     };