From c6fda4fceeb5b5a106483d4f1044a19646b06cd7 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Mon, 21 Sep 2020 22:21:08 +0200
Subject: [PATCH] Don't show initially created rules as failed

---
 src/newsreader/news/collection/models.py                  | 4 ++++
 .../collection/templates/news/collection/views/rules.html | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/newsreader/news/collection/models.py b/src/newsreader/news/collection/models.py
index d1d8024..23d76f6 100644
--- a/src/newsreader/news/collection/models.py
+++ b/src/newsreader/news/collection/models.py
@@ -71,3 +71,7 @@ class CollectionRule(TimeStampedModel):
             return reverse("news:collection:subreddit-update", kwargs={"pk": self.pk})
 
         return reverse("news:collection:feed-update", kwargs={"pk": self.pk})
+
+    @property
+    def failed(self):
+        return not self.succeeded and self.last_run
diff --git a/src/newsreader/news/collection/templates/news/collection/views/rules.html b/src/newsreader/news/collection/templates/news/collection/views/rules.html
index cd98b29..678716e 100644
--- a/src/newsreader/news/collection/templates/news/collection/views/rules.html
+++ b/src/newsreader/news/collection/templates/news/collection/views/rules.html
@@ -37,7 +37,7 @@
           </thead>
           <tbody class="table__body">
             {% for rule in rules %}
-            <tr class="table__row {% if not rule.succeeded %}table__row--error {% endif %}rules-table__row">
+            <tr class="table__row {% if rule.failed %}table__row--error {% endif %}rules-table__row">
                 <td class="table__item rules-table__item">
                   {% with rule|id_for_label:"rules" as id_for_label %}
                     {% include "components/form/checkbox.html" with name="rules" value=rule.pk id=id_for_label id_for_label=id_for_label %}
@@ -55,10 +55,10 @@
                   <a class="link" href="{{ rule.url }}" target="_blank" rel="noopener noreferrer">{{ rule.url }}</a>
                 </td>
                 <td class="table__item rules-table__item">
-                  {% if rule.succeeded %}
-                    <i class="gg-check"></i>
-                  {% else %}
+                  {% if rule.failed %}
                     <i class="gg-danger"></i>
+                  {% else %}
+                    <i class="gg-check"></i>
                   {% endif %}
                 </td>
                 <td class="table__item rules-table__item">