fix result status and log

LDO-CERT · Feb 7, 2024 · f59a430 · f59a430
1 parent 0610eab
commit f59a430
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/orochi/templates/website/index.html b/orochi/templates/website/index.html
@@ -640,8 +640,8 @@ <h4>${data.name}</h4>
 
         // EXPORT FORM
         $(document).on("click", ".misp_export", function () {
+            var btn = $(this);
             bootbox.confirm("Are you sure??", function (result) {
-                var btn = $(this);
                 $.ajax({
                     url: "{% url 'website:export'%}",
                     type: 'get',

diff --git a/orochi/website/middleware.py b/orochi/website/middleware.py
@@ -5,6 +5,7 @@
 
 from orochi.website.models import (
     RESULT_STATUS_DISABLED,
+    RESULT_STATUS_NOT_STARTED,
     RESULT_STATUS_RUNNING,
     Bookmark,
 )
@@ -27,7 +28,7 @@ def process_template_response(self, request, response):
         ):
             news = []
 
-            colors = {1: "green", 2: "green", 3: "orange", 4: "red"}
+            colors = {2: "green", 3: "green", 4: "yellow", 5: "red"}
 
             dumps = get_objects_for_user(request.user, "website.can_see")
             for dump in dumps:
@@ -38,7 +39,11 @@ def process_template_response(self, request, response):
                         f"Status: <b style='color:{colors[result.result]}'>{result.get_result_display()}</b>",
                     }
                     for result in dump.result_set.exclude(
-                        result__in=[RESULT_STATUS_RUNNING, RESULT_STATUS_DISABLED]
+                        result__in=[
+                            RESULT_STATUS_NOT_STARTED,
+                            RESULT_STATUS_RUNNING,
+                            RESULT_STATUS_DISABLED,
+                        ]
                     ).select_related("plugin")
                 )
             news = sorted(news, key=itemgetter("date"), reverse=True)