From c732fdc96e36b1b1cf6e1ce70d4e8b3762f4b1be Mon Sep 17 00:00:00 2001
From: sonny <sonnyba871@gmail.com>
Date: Thu, 21 May 2020 17:11:06 +0200
Subject: [PATCH] Fix RuleWidget

---
 .../news/core/templates/news/core/widgets/rule.html    | 10 +++++-----
 .../news/core/templates/news/core/widgets/rules.html   | 10 ++++++----
 src/newsreader/news/core/widgets.py                    |  5 +++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/newsreader/news/core/templates/news/core/widgets/rule.html b/src/newsreader/news/core/templates/news/core/widgets/rule.html
index fac5e13..b3c7b68 100644
--- a/src/newsreader/news/core/templates/news/core/widgets/rule.html
+++ b/src/newsreader/news/core/templates/news/core/widgets/rule.html
@@ -1,10 +1,10 @@
-<input class="input category-form__input" type="checkbox"
-     name="rules" value="{{ rule.pk }}" checked{% endif %} />
+<input class="input category-form__input" type="{{ option.type }}"
+       name="{{ option.name }}" value="{{ option.value|stringformat:'s' }}"{% if option.selected %} checked{% endif %} />
 
-{% if rule.favicon %}
-  <img class="favicon" src="{{ rule.favicon }}" />
+{% if option.instance.favicon %}
+  <img class="favicon" src="{{ option.instance.favicon }}" />
 {% else %}
   <i class="gg-image"></i>
 {% endif %}
 
-<span>{{ rule.name }}</span>
+<span>{{ option.label }}</span>
diff --git a/src/newsreader/news/core/templates/news/core/widgets/rules.html b/src/newsreader/news/core/templates/news/core/widgets/rules.html
index 60c6a5c..bbdd43a 100644
--- a/src/newsreader/news/core/templates/news/core/widgets/rules.html
+++ b/src/newsreader/news/core/templates/news/core/widgets/rules.html
@@ -1,7 +1,9 @@
 <ul class="list checkbox-list">
-  {% for rule in rules %}
-    <li class="list__item checkbox-list__item">
-      {% include "news/core/widgets/rule.html" %}
-    </li>
+  {% for group, options, index in widget.optgroups %}
+    {% for option in options %}
+      <li class="list__item checkbox-list__item">
+        {% include "news/core/widgets/rule.html" with option=option only %}
+      </li>
+    {% endfor %}
   {% endfor %}
 </ul>
diff --git a/src/newsreader/news/core/widgets.py b/src/newsreader/news/core/widgets.py
index b0d63bf..509c705 100644
--- a/src/newsreader/news/core/widgets.py
+++ b/src/newsreader/news/core/widgets.py
@@ -4,3 +4,8 @@ from django.forms.widgets import CheckboxSelectMultiple
 class RulesWidget(CheckboxSelectMultiple):
     template_name = "news/core/widgets/rules.html"
     option_template_name = "news/core/widgets/rule.html"
+
+    def create_option(self, *args, **kwargs):
+        option = super().create_option(*args, **kwargs)
+        instance = self.choices.queryset.get(pk=option["value"])
+        return {**option, "instance": instance}