From 9df0a867905216a091e4c0a8083a3ce42a08e452 Mon Sep 17 00:00:00 2001
From: Sonny <sonnyba871@gmail.com>
Date: Thu, 21 May 2020 12:58:29 +0200
Subject: [PATCH] Initial rule widget

---
 .../templates/collection/widgets/rule.html    | 10 +++
 .../templates/collection/widgets/rules.html   |  7 +++
 src/newsreader/news/collection/widgets.py     |  6 ++
 src/newsreader/news/core/forms.py             | 17 ++---
 .../core/templates/core/category-create.html  | 13 ++--
 .../news/core/templates/core/category.html    | 62 -------------------
 6 files changed, 34 insertions(+), 81 deletions(-)
 create mode 100644 src/newsreader/news/collection/templates/collection/widgets/rule.html
 create mode 100644 src/newsreader/news/collection/templates/collection/widgets/rules.html
 create mode 100644 src/newsreader/news/collection/widgets.py
 delete mode 100644 src/newsreader/news/core/templates/core/category.html

diff --git a/src/newsreader/news/collection/templates/collection/widgets/rule.html b/src/newsreader/news/collection/templates/collection/widgets/rule.html
new file mode 100644
index 0000000..fac5e13
--- /dev/null
+++ b/src/newsreader/news/collection/templates/collection/widgets/rule.html
@@ -0,0 +1,10 @@
+<input class="input category-form__input" type="checkbox"
+     name="rules" value="{{ rule.pk }}" checked{% endif %} />
+
+{% if rule.favicon %}
+  <img class="favicon" src="{{ rule.favicon }}" />
+{% else %}
+  <i class="gg-image"></i>
+{% endif %}
+
+<span>{{ rule.name }}</span>
diff --git a/src/newsreader/news/collection/templates/collection/widgets/rules.html b/src/newsreader/news/collection/templates/collection/widgets/rules.html
new file mode 100644
index 0000000..d554ece
--- /dev/null
+++ b/src/newsreader/news/collection/templates/collection/widgets/rules.html
@@ -0,0 +1,7 @@
+<ul class="list checkbox-list">
+  {% for rule in rules %}
+    <li class="list__item checkbox-list__item">
+      {% include "collection/widgets/rule.html" %}
+    </li>
+  {% endfor %}
+</ul>
diff --git a/src/newsreader/news/collection/widgets.py b/src/newsreader/news/collection/widgets.py
new file mode 100644
index 0000000..ff65e1d
--- /dev/null
+++ b/src/newsreader/news/collection/widgets.py
@@ -0,0 +1,6 @@
+from django.forms.widgets import CheckboxSelectMultiple
+
+
+class RulesWidget(CheckboxSelectMultiple):
+    template_name = "collection/widgets/rules.html"
+    option_template_name = "collection/widgets/rule.html"
diff --git a/src/newsreader/news/core/forms.py b/src/newsreader/news/core/forms.py
index a86e2b2..97f7fd0 100644
--- a/src/newsreader/news/core/forms.py
+++ b/src/newsreader/news/core/forms.py
@@ -1,20 +1,13 @@
 from django import forms
 
-from newsreader.accounts.models import User
 from newsreader.news.collection.models import CollectionRule
+from newsreader.news.collection.widgets import RulesWidget
 from newsreader.news.core.models import Category
 
 
 class CategoryForm(forms.ModelForm):
     rules = forms.ModelMultipleChoiceField(
-        required=False,
-        queryset=CollectionRule.objects.all(),
-        widget=forms.widgets.CheckboxSelectMultiple,
-    )
-
-    user = forms.ModelChoiceField(
-        queryset=User.objects.none(),
-        widget=forms.widgets.HiddenInput(attrs={"readonly": True}),
+        required=False, queryset=CollectionRule.objects.all(), widget=RulesWidget
     )
 
     def __init__(self, *args, **kwargs):
@@ -23,12 +16,10 @@ class CategoryForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
 
         self.fields["rules"].queryset = CollectionRule.objects.filter(user=self.user)
-        self.fields["user"].queryset = User.objects.filter(pk=self.user.pk)
-
-        self.initial["user"] = self.user
 
     def save(self, commit=True):
         instance = super().save(commit=False)
+        instance.user = self.user
 
         if commit:
             instance.save()
@@ -41,4 +32,4 @@ class CategoryForm(forms.ModelForm):
 
     class Meta:
         model = Category
-        fields = ("name", "rules", "user")
+        fields = ("name", "rules")
diff --git a/src/newsreader/news/core/templates/core/category-create.html b/src/newsreader/news/core/templates/core/category-create.html
index 73d05b5..e145760 100644
--- a/src/newsreader/news/core/templates/core/category-create.html
+++ b/src/newsreader/news/core/templates/core/category-create.html
@@ -1,9 +1,10 @@
-{% extends "core/category.html" %}
+{% extends "base.html" %}
 
-{% block form-header %}
-  <h1 class="h1 form__title">Create a category</h1>
-{% endblock %}
+{% load static %}
 
-{% block confirm-button %}
-  <button class="button button--confirm">Create category</button>
+{% block content %}
+  <main id="category--page" class="main">
+    {% url "news:core:categories" as cancel_url %}
+    {% include "form/form.html" with form=form title="Create category" cancel_url=cancel_url only %}
+  </main>
 {% endblock %}
diff --git a/src/newsreader/news/core/templates/core/category.html b/src/newsreader/news/core/templates/core/category.html
deleted file mode 100644
index bee0585..0000000
--- a/src/newsreader/news/core/templates/core/category.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block content %}
-  <main id="category--page" class="main">
-    <form class="form category-form" method="post">
-      {% csrf_token %}
-
-      <div class="form__header">
-        {% block form-header %}{% endblock %}
-      </div>
-
-      {{ form.non_field_errors }}
-      {{ form.user.errors }}
-      {{ form.user }}
-
-      <section class="section form__section category-form__section">
-        <fieldset class="form__fieldset category-form__fieldset">
-          <label class="label category-form__label" for="name">Name</label>
-          {{ form.name.errors }}
-          {{ form.name }}
-        </fieldset>
-      </section>
-
-      <section class="section form__section category-form__section">
-        <fieldset class="form__fieldset category-form__fieldset">
-          <label class="label category-form__label" for="rules">Collection rules</label>
-          <small class="small help-text">
-            Note that existing assigned rules will be reassigned to this category
-          </small>
-          {{ form.rules.errors }}
-
-          <ul class="list checkbox-list">
-            {% for rule in rules %}
-              <li class="list__item checkbox-list__item">
-                <input class="input category-form__input" type="checkbox" name="rules"
-                  {% if category and rule.pk in category.rule_ids %}checked{% endif %}
-                  value="{{ rule.pk }}" />
-
-                {% if rule.favicon %}
-                  <img class="favicon" src="{{ rule.favicon }}" />
-                {% else %}
-                  <i class="gg-image"></i>
-                {% endif %}
-
-                <span>{{ rule.name }}</span>
-              </li>
-            {% endfor %}
-          </ul>
-        </fieldset>
-      </section>
-
-      <section class="section form__section category-form__section">
-        <fieldset class="form__fieldset category-form__fieldset">
-          <a class="link button button--cancel" href="{% url 'news:core:categories' %}">Cancel</a>
-          {% block confirm-button %}{% endblock %}
-        </fieldset>
-      </section>
-    </form>
-  </main>
-{% endblock %}